From 0589c23975fa80521e9416c775f62493fe04669a Mon Sep 17 00:00:00 2001
From: Maksim Eltyshev <meltyshev@gmail.com>
Date: Sun, 24 Jul 2022 17:13:28 +0200
Subject: [PATCH] fix: Fix core locale loading

---
 client/src/i18n.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/client/src/i18n.js b/client/src/i18n.js
index a47977dc..c945ba77 100644
--- a/client/src/i18n.js
+++ b/client/src/i18n.js
@@ -79,21 +79,19 @@ i18n
     debug: process.env.NODE_ENV !== 'production',
   });
 
-i18n.loadCoreLocale = (language = i18n.resolvedLanguage) => {
+i18n.loadCoreLocale = async (language = i18n.resolvedLanguage) => {
   if (language === 'en') {
     return;
   }
 
-  import(`./locales/${language}/core`).then((module) => {
-    const locale = module.default;
+  const { default: locale } = await import(`./locales/${language}/core`);
 
-    Object.keys(locale).forEach((namespace) => {
-      if (namespace === 'dateFns') {
-        i18n.dateFns.addLocale(language, locale[namespace]);
-      } else {
-        i18n.addResourceBundle(language, namespace, locale[namespace], true, true);
-      }
-    });
+  Object.keys(locale).forEach((namespace) => {
+    if (namespace === 'dateFns') {
+      i18n.dateFns.addLocale(language, locale[namespace]);
+    } else {
+      i18n.addResourceBundle(language, namespace, locale[namespace], true, true);
+    }
   });
 };