fix: align en locale lang to be full specified (en-US)

felixmosh · Nov 29, 2023 · 3014f47 · 3014f47
1 parent e06f3b5
commit 3014f47
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/ui/src/index.tsx b/packages/ui/src/index.tsx
@@ -18,7 +18,7 @@ const uiConfig = JSON.parse(
   document.getElementById('__UI_CONFIG__')?.textContent || '{}'
 ) as UIConfig;
 
-initI18n({ lng: uiConfig.locale?.lng || 'en', basePath }).then(() => {
+initI18n({ lng: uiConfig.locale?.lng || 'en-US', basePath }).then(() => {
   render(
     <BrowserRouter basename={basePath}>
       <UIConfigContext.Provider value={uiConfig}>

diff --git a/packages/ui/src/services/i18n.ts b/packages/ui/src/services/i18n.ts
@@ -16,13 +16,13 @@ export async function initI18n({ lng, basePath }: { lng: string; basePath: strin
     i18nextInstance.use(new HMRPlugin({ webpack: { client: true } }));
     (window as any).testI18n = (lng = 'cimode') => i18nextInstance.changeLanguage(lng);
   }
-  const locale = lng === 'en' ? 'en-US' : lng;
-  dateFnsLocale = await import(`date-fns/locale/${locale}/index.js`).catch((e) => console.error(e));
+  dateFnsLocale = await import(`date-fns/locale/${lng}/index.js`).catch((e) => console.error(e));
   return i18nextInstance.init({
     lng,
-    fallbackLng: 'en',
+    fallbackLng: 'en-US',
     defaultNS: 'messages',
     ns: 'messages',
+    load: 'currentOnly',
     backend: {
       loadPath: `${basePath}static/locales/{{lng}}/{{ns}}.json`,
       queryParams: { v: process.env.APP_VERSION },

diff --git a/...es/ui/src/static/locales/en/messages.json → ...ui/src/static/locales/en-US/messages.json b/...es/ui/src/static/locales/en/messages.json → ...ui/src/static/locales/en-US/messages.json