Merge pull request #4059 from ProjectMirador/initialize-i18n

Initialize the i18n instance with the correct locale.
ProjectMirador · Dec 18, 2024 · d19b3bd · d19b3bd
2 parents d5b1bc9 + e5d1414
commit d19b3bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/components/AppProviders.js b/src/components/AppProviders.js
@@ -71,9 +71,9 @@ FullScreenShim.propTypes = {
  * plugins + config to inject additional translations.
  */
 const StoreAwareI18nextProvider = ({ children, language, translations }) => {
-  const [i18n] = useState(createI18nInstance());
+  const [i18n] = useState(createI18nInstance({ lng: language }));
   useEffect(() => {
-    i18n.changeLanguage(language);
+    if (i18n && i18n.language !== language) i18n.changeLanguage(language);
   }, [i18n, language]);
 
   useEffect(() => {

diff --git a/src/i18n.js b/src/i18n.js
@@ -25,7 +25,7 @@ import nbNo from './locales/nbNo/translation.json';
 /**
  * Load translations for each language
  */
-function createI18nInstance() {
+function createI18nInstance(i18nConfig = {}) {
   const resources = {
     ar,
     bg,
@@ -58,6 +58,7 @@ function createI18nInstance() {
     },
     lng: 'en',
     resources,
+    ...i18nConfig,
   });
 
   return instance;