Merge pull request #4443 from mlocati/patch-2

[5.7] Mitigate problems about loading translation files Former-commit-id: b4beb96 Former-commit-id: 5ae79c776ffff2fda09abcbc205834e5296eb4e3
concretecms · Oct 4, 2016 · 77416e6 · 77416e6
2 parents efc9b4b + 9de8634
commit 77416e6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/web/concrete/src/Application/Application.php b/web/concrete/src/Application/Application.php
@@ -292,6 +292,8 @@ public function setupPackages()
             }
             $pkg->setupPackageLocalization();
         }
+        $config->set('app.bootstrap.packages_loaded', true);
+        \Localization::setupSiteLocalization();
         foreach($this->packages as $pkg) {
             if (method_exists($pkg, 'on_start')) {
                 $pkg->on_start();
@@ -300,8 +302,6 @@ public function setupPackages()
                 $checkAfterStart = true;
             }
         }
-        $config->set('app.bootstrap.packages_loaded', true);
-        \Localization::setupSiteLocalization();
 
         if ($checkAfterStart) {
             foreach($this->packages as $pkg) {