tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 23:34:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update web bootstrapping to suit the new localization procedure

Browse Source 
Icinga\Application\Web::setupInternationalization now sets up the locale
from the current session first, if any, and falls back to the one from the
user's preferences, if any.

refs #6073
This commit is contained in:
Johannes Meyer 2014-06-25 14:34:45 +02:00
parent d01d17ad5e
commit 77bb64bd2c
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
library/Icinga/Application/Web.php
View File

@ -34,7 +34,6 @@ require_once __DIR__ . '/ApplicationBootstrap.php';
use Icinga\Authentication\Manager as AuthenticationManager; use Icinga\Authentication\Manager as AuthenticationManager;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;
use Icinga\Exception\NotReadableError;
use Icinga\Logger\Logger; use Icinga\Logger\Logger;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Web\Response; use Icinga\Web\Response;
@ -44,7 +43,6 @@ use Icinga\Web\Session;
use Icinga\User; use Icinga\User;
use Icinga\Util\Translator; use Icinga\Util\Translator;
use Icinga\Util\DateTimeFactory; use Icinga\Util\DateTimeFactory;
use DateTimeZone;
use Exception; use Exception;
use Zend_Layout; use Zend_Layout;
use Zend_Paginator; use Zend_Paginator;
@ -340,25 +338,40 @@ class Web extends ApplicationBootstrap
/** /**
* Setup internationalization using gettext * Setup internationalization using gettext
* *
* Uses the preferred user language or the configured default and system default, respectively. * Uses the locale from the session or the user's preferences
* *
* @return self * @return self
*/ */
protected function setupInternationalization() protected function setupInternationalization()
{ {
parent::setupInternationalization(); parent::setupInternationalization();
if ($this->user !== null && $this->user->getPreferences() !== null
&& ($locale = $this->user->getPreferences()->get('app.language') !== null) $locale = Session::getSession()->get('language');
if ($locale !== null) {
try {
Translator::setupLocale($locale);
} catch (Exception $e) {
Logger::debug(
'Cannot set locale "' . $locale . '" configured in session' .
' "' . session_id() . '" (' . $e->getMessage() . ')'
);
$locale = null;
}
}
if ($locale === null && $this->user !== null && $this->user->getPreferences() !== null
&& ($locale = $this->user->getPreferences()->get('app.language')) !== null
) { ) {
try { try {
Translator::setupLocale($locale); Translator::setupLocale($locale);
} catch (Exception $error) { } catch (Exception $e) {
Logger::warning( Logger::warning(
'Cannot set locale "' . $locale . '" configured in ' . 'Cannot set locale "' . $locale . '" configured in preferences of ' .
'preferences of user "' . $this->user->getUsername() . '"' 'user "' . $this->user->getUsername() . '" (' . $e->getMessage() . ')'
); );
} }
} }
return $this; return $this;
} }