diff --git a/lib/Config/Initializer.php b/lib/Config/Initializer.php index 486c8713f6..e6621d4ce0 100644 --- a/lib/Config/Initializer.php +++ b/lib/Config/Initializer.php @@ -72,6 +72,9 @@ class Initializer { /** @var \MailPoet\PostEditorBlocks\PostEditorBlock */ private $postEditorBlock; + /** @var Localizer */ + private $localizer; + const INITIALIZED = 'MAILPOET_INITIALIZED'; public function __construct( @@ -90,7 +93,8 @@ class Initializer { DatabaseInitializer $databaseInitializer, WCTransactionalEmails $wcTransactionalEmails, PostEditorBlock $postEditorBlock, - WooCommerceHelper $wcHelper + WooCommerceHelper $wcHelper, + Localizer $localizer ) { $this->rendererFactory = $rendererFactory; $this->accessControl = $accessControl; @@ -108,6 +112,7 @@ class Initializer { $this->wcTransactionalEmails = $wcTransactionalEmails; $this->wcHelper = $wcHelper; $this->postEditorBlock = $postEditorBlock; + $this->localizer = $localizer; } public function init() { @@ -254,8 +259,7 @@ class Initializer { } public function setupLocalizer() { - $localizer = new Localizer(); - $localizer->init(); + $this->localizer->init(); } public function setupCapabilities() { @@ -297,8 +301,7 @@ class Initializer { public function setupUserLocale() { if (get_user_locale() === WPFunctions::get()->getLocale()) return; WPFunctions::get()->unloadTextdomain(Env::$pluginName); - $localizer = new Localizer(); - $localizer->init(); + $this->localizer->init(); } public function setupPages() { diff --git a/lib/DI/ContainerConfigurator.php b/lib/DI/ContainerConfigurator.php index 30438cf7ce..373b02611d 100644 --- a/lib/DI/ContainerConfigurator.php +++ b/lib/DI/ContainerConfigurator.php @@ -96,6 +96,7 @@ class ContainerConfigurator implements IContainerConfigurator { $container->autowire(\MailPoet\Config\DatabaseInitializer::class); $container->autowire(\MailPoet\Config\Hooks::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\MP2Migrator::class); $container->autowire(\MailPoet\Config\RendererFactory::class)->setPublic(true);