fix: correct language logic

nshenderov · Oct 4, 2024 · 3c8f88a · 3c8f88a
1 parent 16a30ff
commit 3c8f88a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/admin/src/components/Input/config/language.js b/admin/src/components/Input/config/language.js
@@ -97,26 +97,22 @@ export const setLanguage = async (config) => {
   const preferedLanguage = getPreferedLanguage();
 
   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
-  );
 };
diff --git a/admin/src/utils/localStorage.js b/admin/src/utils/localStorage.js
@@ -1,7 +1,7 @@
 const STORAGE_KEYS = {
   TOKEN: 'jwtToken',
   PREFERED_LANGUAGE: 'strapi-admin-language',
-  PROFILE_THEME: 'STRAPI_THEME'
+  PROFILE_THEME: 'STRAPI_THEME',
 };
 
 export const getStoredToken = () => {
@@ -17,11 +17,14 @@ export const getStoredToken = () => {
 };
 
 export const getPreferedLanguage = () => {
-  const language = localStorage.getItem(STORAGE_KEYS.PREFERED_LANGUAGE) || 'en';
+  const language =
+    localStorage
+      .getItem(STORAGE_KEYS.PREFERED_LANGUAGE)
+      .replace(/^"|"$/g, '') || 'en';
   return language;
 };
 
 export const getProfileTheme = () => {
-  const theme  = localStorage.getItem(STORAGE_KEYS.PROFILE_THEME) || 'en';
+  const theme = localStorage.getItem(STORAGE_KEYS.PROFILE_THEME) || 'en';
   return theme;
 };