Merge ecde555 into e2099b5

forkcms · Sep 25, 2019 · 93c9450 · 93c9450
2 parents e2099b5 + ecde555
commit 93c9450
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/Backend/Core/Language/Language.php b/src/Backend/Core/Language/Language.php
@@ -243,16 +243,15 @@ public static function getWorkingLanguages(): array
      */
     public static function setLocale(string $language): void
     {
+        $application = (defined('APPLICATION') && APPLICATION === 'Console') ? 'Backend' : APPLICATION;
+
         // validate file, generate it if needed
         if (!is_file(BACKEND_CACHE_PATH . '/Locale/en.json')) {
-            BackendLocaleModel::buildCache('en', APPLICATION);
+            BackendLocaleModel::buildCache('en', $application);
         }
         if (!is_file(BACKEND_CACHE_PATH . '/Locale/' . $language . '.json')) {
             // if you use the language in the console act like it is in the backend
-            BackendLocaleModel::buildCache(
-                $language,
-                (!defined('APPLICATION') || APPLICATION === 'Console') ? 'Backend' : APPLICATION
-            );
+            BackendLocaleModel::buildCache($language, $application);
         }
 
         // store