diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php index b3eeb0ed5..a01648e82 100644 --- a/gulliver/system/class.bootstrap.php +++ b/gulliver/system/class.bootstrap.php @@ -2625,13 +2625,17 @@ class Bootstrap { $acceptLanguage = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : 'en'; if (!defined('SYS_LANG')) { - $Translations = new \Translation; + $Translations = new Translation; // Get the translation uploaded in the system $translationsTable = $Translations->getTranslationEnvironments(); $inLang = false; foreach ($translationsTable as $locale) { // Check if the language used was uploaded in the Language - if ($locale['LOCALE'] === $acceptLanguage) { + // The languages can defined like this : en, en-US (language-localization) + // We need to validate if the language exist it does not matter the localization + $language = explode('-', $locale['LOCALE']); + $language = head($language); + if ($language === $acceptLanguage) { $inLang = true; break; } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index 65438effb..bd9579d9c 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -1859,6 +1859,11 @@ class Cases $arrayCaseVariable = array_merge($arrayCaseVariable, $dateHistory); } + // Get the SYS_LANG defined, it can be updated + if (defined('SYS_LANG')) { + $arrayCaseVariable['SYS_LANG'] = SYS_LANG; + } + return $arrayCaseVariable; }