Skip to content

Commit 38d4e24

Browse files
committed
[Framework][Translate] Changed translation order to allow language pack overriding by theme
1 parent d7a3849 commit 38d4e24

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public function testLoadData($area, $forceReload, $cachedData)
185185
$expected = [
186186
'module original' => 'module translated',
187187
'module theme' => 'theme translated overwrite',
188-
'module pack' => 'pack translated overwrite',
188+
'module pack' => 'theme-pack translated overwrite',
189189
'module db' => 'db translated overwrite',
190190
'theme original' => 'theme translated',
191191
'pack original' => 'pack translated',

lib/internal/Magento/Framework/Translate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ public function loadData($area = null, $forceReload = false)
177177
$this->_data = [];
178178

179179
$this->_loadModuleTranslation();
180-
$this->_loadThemeTranslation();
181180
$this->_loadPackTranslation();
181+
$this->_loadThemeTranslation();
182182
$this->_loadDbTranslation();
183183

184184
if (!$forceReload) {

0 commit comments

Comments
 (0)