Fix translations for legacy parts of BO.

PrestaShop · May 9, 2022 · 1d151ce · 1d151ce
1 parent 4d94958
commit 1d151ce
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/config/config.inc.php b/config/config.inc.php
@@ -221,7 +221,13 @@
 if (isset($cookie->id_lang) && $cookie->id_lang) {
     $language = new Language($cookie->id_lang);
 }
-if (!isset($language) || !Validate::isLoadedObject($language) || !$language->isAssociatedToShop()) {
+
+$isNotValidLanguage = !isset($language) || !Validate::isLoadedObject($language);
+// `true` if language is defined from multishop or backoffice session
+$isLanguageDefinedFromCustomSession = (isset($language) && $language->isAssociatedToShop()) || isset($employee);
+
+$useDefaultLanguage = $isNotValidLanguage || !$isLanguageDefinedFromCustomSession;
+if ($useDefaultLanguage) {
     $language = new Language(Configuration::get('PS_LANG_DEFAULT'));
 }