fix: correct language logic

nshenderov · Oct 4, 2024 · 9e43157 · 9e43157
1 parent b5f0991
commit 9e43157
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/admin/src/Input/config/language.js b/admin/src/Input/config/language.js
@@ -17,29 +17,26 @@ const detecti18n = () => {
 
 export const setLanguage = async (config) => {
   const i18nLang = detecti18n();
+
   const preferedLanguage = auth.getUserInfo().preferedLanguage || 'en';
 
   const {
-    ui = preferedLanguage,
-    content,
+    ui = config.language && typeof config.language === 'string' ?
+      config.language
+    : preferedLanguage,
     textPartLanguage,
     ignorei18n,
   } = config.language || {};
 
-  if (i18nLang) {
+  if (i18nLang && !ignorei18n) {
     config.language = {
-      ui: typeof config.language === 'string' ? config.language : ui,
-      content: ignorei18n ? content : i18nLang,
+      ui: ui,
+      content: i18nLang,
       textPartLanguage: textPartLanguage,
     };
   }
 
-  if (!config.language) {
-    config.language = preferedLanguage;
+  if (ui !== 'en') {
+    await importLang(config, ui);
   }
-
-  await importLang(
-    config,
-    typeof config.language === 'string' ? config.language : ui
-  );
 };