fix: i18n resolution (#3299)

cowprotocol · Feb 11, 2022 · b042d2b · b042d2b
1 parent 897e7f4
commit b042d2b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.env b/.env
@@ -1 +1,2 @@
-REACT_APP_INFURA_KEY="4bf032f2d38a4ed6bb975b80d6340847"
+REACT_APP_INFURA_KEY="4bf032f2d38a4ed6bb975b80d6340847"
+REACT_APP_LOCALES="locales"
diff --git a/cosmos.override.js b/cosmos.override.js
@@ -17,7 +17,7 @@ module.exports = (webpackConfig) => ({
         'process.env': {
           ...plugin.definitions['process.env'],
           REACT_APP_IS_WIDGET: true,
-          REACT_APP_LOCALES: "'../locales'",
+          REACT_APP_LOCALES: '"../locales"',
         },
       })
     }

diff --git a/rollup.config.ts b/rollup.config.ts
@@ -23,7 +23,7 @@ import { CompilerOptions } from 'typescript'
 
 const REPLACEMENTS = {
   'process.env.REACT_APP_IS_WIDGET': true,
-  'process.env.REACT_APP_LOCALES': "'./locales'",
+  'process.env.REACT_APP_LOCALES': '"./locales"',
 }
 
 const EXTENSIONS = ['.js', '.jsx', '.ts', '.tsx']

diff --git a/src/lib/i18n.tsx b/src/lib/i18n.tsx
@@ -81,9 +81,7 @@ export async function dynamicActivate(locale: SupportedLocale) {
   // There are no default messages in production; instead, bundle the default to save a network request:
   // see https://github.com/lingui/js-lingui/issues/388#issuecomment-497779030
   const catalog =
-    locale === DEFAULT_LOCALE
-      ? DEFAULT_CATALOG
-      : await import(`${process.env.REACT_APP_LOCALES || 'locales'}/${locale}`)
+    locale === DEFAULT_LOCALE ? DEFAULT_CATALOG : await import(`${process.env.REACT_APP_LOCALES}/${locale}`)
   i18n.load(locale, catalog.messages)
   i18n.activate(locale)
 }