Skip to content

Fix translations of category design theme not being applied #17854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-engcom-team merged 1 commit into from
Nov 12, 2018
Merged

Fix translations of category design theme not being applied #17854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion app/code/Magento/Catalog/Model/Design.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*/
namespace Magento\Catalog\Model;

use \Magento\Framework\TranslateInterface;

/**
* Catalog Custom Category design Model
*
Expand All @@ -31,6 +33,11 @@ class Design extends \Magento\Framework\Model\AbstractModel
*/
protected $_localeDate;

/**
* @var TranslateInterface
*/
private $translator;

/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
Expand All @@ -47,10 +54,13 @@ public function __construct(
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
array $data = []
array $data = [],
TranslateInterface $translator = null
) {
$this->_localeDate = $localeDate;
$this->_design = $design;
$this->translator = $translator ?:
\Magento\Framework\App\ObjectManager::getInstance()->get(TranslateInterface::class);
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
}

Expand All @@ -63,6 +73,7 @@ public function __construct(
public function applyCustomDesign($design)
{
$this->_design->setDesignTheme($design);
$this->translator->loadData(null, true);
return $this;
}

Expand Down
4 changes: 4 additions & 0 deletions dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,12 @@ public function testApplyCustomDesign($theme)
$design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
\Magento\Framework\View\DesignInterface::class
);
$translate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
\Magento\Framework\TranslateInterface::class
);
$this->assertEquals('package', $design->getDesignTheme()->getPackageCode());
$this->assertEquals('theme', $design->getDesignTheme()->getThemeCode());
$this->assertEquals('themepackage/theme', $translate->getTheme());
}

/**
Expand Down