Skip to content

Commit f6eb7fb

Browse files
committed
Fix translations of category design theme not being applied
1 parent 0ddea98 commit f6eb7fb

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

app/code/Magento/Catalog/Model/Design.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\Catalog\Model;
77

8+
use \Magento\Framework\TranslateInterface;
9+
810
/**
911
* Catalog Custom Category design Model
1012
*
@@ -31,6 +33,11 @@ class Design extends \Magento\Framework\Model\AbstractModel
3133
*/
3234
protected $_localeDate;
3335

36+
/**
37+
* @var TranslateInterface
38+
*/
39+
private $translator;
40+
3441
/**
3542
* @param \Magento\Framework\Model\Context $context
3643
* @param \Magento\Framework\Registry $registry
@@ -47,10 +54,13 @@ public function __construct(
4754
\Magento\Framework\View\DesignInterface $design,
4855
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
4956
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
50-
array $data = []
57+
array $data = [],
58+
TranslateInterface $translator = null
5159
) {
5260
$this->_localeDate = $localeDate;
5361
$this->_design = $design;
62+
$this->translator = $translator ?:
63+
\Magento\Framework\App\ObjectManager::getInstance()->get(TranslateInterface::class);
5464
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
5565
}
5666

@@ -63,6 +73,7 @@ public function __construct(
6373
public function applyCustomDesign($design)
6474
{
6575
$this->_design->setDesignTheme($design);
76+
$this->translator->loadData(null, true);
6677
return $this;
6778
}
6879

dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,12 @@ public function testApplyCustomDesign($theme)
3232
$design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
3333
\Magento\Framework\View\DesignInterface::class
3434
);
35+
$translate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
36+
\Magento\Framework\TranslateInterface::class
37+
);
3538
$this->assertEquals('package', $design->getDesignTheme()->getPackageCode());
3639
$this->assertEquals('theme', $design->getDesignTheme()->getThemeCode());
40+
$this->assertEquals('themepackage/theme', $translate->getTheme());
3741
}
3842

3943
/**

0 commit comments

Comments
 (0)