Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add Localizer to DI

Browse Source 
[MAILPOET-2942]
This commit is contained in:
Rostislav Wolny
2020-06-11 16:48:51 +02:00
committed by Veljko V
parent f3370a62d0
commit 4897581748
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Config/Initializer.php
View File

@ -72,6 +72,9 @@ class Initializer {
/** @var \MailPoet\PostEditorBlocks\PostEditorBlock */ /** @var \MailPoet\PostEditorBlocks\PostEditorBlock */
private $postEditorBlock; private $postEditorBlock;
/** @var Localizer */
private $localizer;
const INITIALIZED = 'MAILPOET_INITIALIZED'; const INITIALIZED = 'MAILPOET_INITIALIZED';
public function __construct( public function __construct(
@ -90,7 +93,8 @@ class Initializer {
DatabaseInitializer $databaseInitializer, DatabaseInitializer $databaseInitializer,
WCTransactionalEmails $wcTransactionalEmails, WCTransactionalEmails $wcTransactionalEmails,
PostEditorBlock $postEditorBlock, PostEditorBlock $postEditorBlock,
WooCommerceHelper $wcHelper WooCommerceHelper $wcHelper,
Localizer $localizer
) { ) {
$this->rendererFactory = $rendererFactory; $this->rendererFactory = $rendererFactory;
$this->accessControl = $accessControl; $this->accessControl = $accessControl;
@ -108,6 +112,7 @@ class Initializer {
$this->wcTransactionalEmails = $wcTransactionalEmails; $this->wcTransactionalEmails = $wcTransactionalEmails;
$this->wcHelper = $wcHelper; $this->wcHelper = $wcHelper;
$this->postEditorBlock = $postEditorBlock; $this->postEditorBlock = $postEditorBlock;
$this->localizer = $localizer;
} }
public function init() { public function init() {
@ -254,8 +259,7 @@ class Initializer {
} }
public function setupLocalizer() { public function setupLocalizer() {
$localizer = new Localizer(); $this->localizer->init();
$localizer->init();
} }
public function setupCapabilities() { public function setupCapabilities() {
@ -297,8 +301,7 @@ class Initializer {
public function setupUserLocale() { public function setupUserLocale() {
if (get_user_locale() === WPFunctions::get()->getLocale()) return; if (get_user_locale() === WPFunctions::get()->getLocale()) return;
WPFunctions::get()->unloadTextdomain(Env::$pluginName); WPFunctions::get()->unloadTextdomain(Env::$pluginName);
$localizer = new Localizer(); $this->localizer->init();
$localizer->init();
} }
public function setupPages() { public function setupPages() {

1
lib/DI/ContainerConfigurator.php
View File

@ -96,6 +96,7 @@ class ContainerConfigurator implements IContainerConfigurator {
$container->autowire(\MailPoet\Config\DatabaseInitializer::class); $container->autowire(\MailPoet\Config\DatabaseInitializer::class);
$container->autowire(\MailPoet\Config\Hooks::class)->setPublic(true); $container->autowire(\MailPoet\Config\Hooks::class)->setPublic(true);
$container->autowire(\MailPoet\Config\Initializer::class)->setPublic(true); $container->autowire(\MailPoet\Config\Initializer::class)->setPublic(true);
$container->autowire(\MailPoet\Config\Localizer::class);
$container->autowire(\MailPoet\Config\Menu::class)->setPublic(true); $container->autowire(\MailPoet\Config\Menu::class)->setPublic(true);
$container->autowire(\MailPoet\Config\MP2Migrator::class); $container->autowire(\MailPoet\Config\MP2Migrator::class);
$container->autowire(\MailPoet\Config\RendererFactory::class)->setPublic(true); $container->autowire(\MailPoet\Config\RendererFactory::class)->setPublic(true);