Merge pull request #1851 from getAlby/refactor/i18n-config

Refactor/i18n config
getAlby · Dec 11, 2022 · 76e4cee · 76e4cee
2 parents cf0aca3 + 6a04000
commit 76e4cee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/app/context/SettingsContext.tsx b/src/app/context/SettingsContext.tsx
@@ -113,7 +113,7 @@ export const SettingsProvider = ({
 
     // need to switch i.e. `pt_BR` to `pt-br`
     const daysjsLocaleFormatted = settings.locale
-      .toLocaleLowerCase()
+      .toLowerCase()
       .replace("_", "-");
     dayjs.locale(daysjsLocaleFormatted);
   }, [settings.locale]);

diff --git a/src/common/utils/currencyConvert.ts b/src/common/utils/currencyConvert.ts
@@ -13,7 +13,7 @@ export const getFormattedFiat = (params: {
 }) => {
   const fiatValue = Number(params.amount) * params.rate;
 
-  const l = (params.locale || "en").toLocaleLowerCase().replace("_", "-");
+  const l = (params.locale || "en").toLowerCase().replace("_", "-");
   return new Intl.NumberFormat(l || "en", {
     style: "currency",
     currency: params.currency,
@@ -24,7 +24,7 @@ export const getFormattedNumber = (params: {
   amount: number | string;
   locale: string;
 }) => {
-  const l = (params.locale || "en").toLocaleLowerCase().replace("_", "-");
+  const l = (params.locale || "en").toLowerCase().replace("_", "-");
   return new Intl.NumberFormat(l || "en").format(Number(params.amount));
 };
 

diff --git a/src/i18n/i18nConfig.ts b/src/i18n/i18nConfig.ts
@@ -1,6 +1,8 @@
-// dayjs locales must be imported as well
+// dayjs locales must be imported as well, list: https://github.com/iamkun/dayjs/tree/dev/src/locale
 import "dayjs/locale/es";
+import "dayjs/locale/it";
 import "dayjs/locale/pt-br";
+import "dayjs/locale/sv";
 import i18n from "i18next";
 import LanguageDetector from "i18next-browser-languagedetector";
 import { initReactI18next } from "react-i18next";
@@ -24,6 +26,11 @@ export const resources = {
     common: es.common,
     components: es.components,
   },
+  it: {
+    translation: it.translation,
+    common: it.common,
+    components: it.components,
+  },
   "pt-BR": {
     translation: pt_BR.translation,
     common: pt_BR.common,
@@ -34,20 +41,15 @@ export const resources = {
     common: sv.common,
     components: sv.components,
   },
-  it: {
-    translation: it.translation,
-    common: it.common,
-    components: it.components,
-  },
 } as const;
 
 // needs to be aligned with `resources`
 export const supportedLocales = [
   { locale: "en", label: "English" },
   { locale: "es", label: "Español" },
+  { locale: "it", label: "Italiano" },
   { locale: "pt-BR", label: "Português (Brasil)" },
   { locale: "sv", label: "Svenska" },
-  { locale: "it", label: "Italiano" },
 ];
 
 i18n