MAGETWO-65770: [GitHub][PR] [Framework][Translate] Changed translation order to allow language #7142

 - Merge Pull Request #7142 from JSchlarb/magento2:develop

Author: Fabian Schmengler

lib/internal/Magento/Framework/Test/Unit/TranslateTest.php

@@ -202,7 +202,7 @@ public function testLoadData($area, $forceReload, $cachedData)
         $expected = [
             'module original' => 'module translated',
             'module theme' => 'theme translated overwrite',
-            'module pack' => 'pack translated overwrite',
+            'module pack' => 'theme-pack translated overwrite',
             'module db' => 'db translated overwrite',
             'theme original' => 'theme translated',
             'pack original' => 'pack translated',

lib/internal/Magento/Framework/Translate.php

@@ -182,8 +182,8 @@ public function loadData($area = null, $forceReload = false)
         $this->_data = [];
 
         $this->_loadModuleTranslation();
-        $this->_loadThemeTranslation();
         $this->_loadPackTranslation();
+        $this->_loadThemeTranslation();
         $this->_loadDbTranslation();
 
         if (!$forceReload) {