Module: Register locales using ipl-i18n

This commit is contained in:
Johannes Meyer 2021-05-20 09:11:21 +02:00
parent bfd2449e5d
commit 8137f1546f

View File

@ -13,9 +13,10 @@ use Icinga\Exception\IcingaException;
use Icinga\Exception\ProgrammingError; use Icinga\Exception\ProgrammingError;
use Icinga\Module\Setup\SetupWizard; use Icinga\Module\Setup\SetupWizard;
use Icinga\Util\File; use Icinga\Util\File;
use Icinga\Util\Translator;
use Icinga\Web\Navigation\Navigation; use Icinga\Web\Navigation\Navigation;
use Icinga\Web\Widget; use Icinga\Web\Widget;
use ipl\I18n\GettextTranslator;
use ipl\I18n\StaticTranslator;
use RecursiveDirectoryIterator; use RecursiveDirectoryIterator;
use RecursiveIteratorIterator; use RecursiveIteratorIterator;
use Zend_Controller_Router_Route; use Zend_Controller_Router_Route;
@ -1418,9 +1419,10 @@ class Module
*/ */
protected function registerLocales() protected function registerLocales()
{ {
if ($this->hasLocales()) { if ($this->hasLocales() && StaticTranslator::$instance instanceof GettextTranslator) {
Translator::registerDomain($this->name, $this->localedir); StaticTranslator::$instance->addTranslationDirectory($this->localedir, $this->name);
} }
return $this; return $this;
} }