Fix for trying to lookup the default language too early.

xibosignage/xibo#1578
dasgarner · Jul 16, 2018 · 130bd0c · 130bd0c · farmaceutics · Jul 26, 2018
1 parent 5904fc0
commit 130bd0c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/Helper/Translate.php b/lib/Helper/Translate.php
@@ -46,7 +46,7 @@ class Translate
     public static function InitLocale($config, $language = NULL)
     {
         // The default language
-        $default = $config->GetSetting('DEFAULT_LANGUAGE');
+        $default = ($language === null) ? $config->GetSetting('DEFAULT_LANGUAGE') : $language;
 
         // Build an array of supported languages
         $localeDir = PROJECT_ROOT . '/locale';