tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve failure handling when setting the locale

This commit is contained in:
Johannes Meyer 2014-04-04 15:34:46 +02:00
parent 8be3ccc527
commit ea44ae3693
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,7 +363,7 @@ class Web extends ApplicationBootstrap
try {
Translator::setupLocale($locale);
} catch (Exception $error) {
Logger::info(
Logger::warning(
'Cannot set locale "' . $locale . '" configured in ' .
'preferences of user "' . $this->user->getUsername() . '"'
);

8
library/Icinga/Util/Translator.php
View File

@ -104,14 +104,14 @@ class Translator
*/
public static function setupLocale($localeName)
{
if (setlocale(LC_ALL, $localeName . '.UTF-8') === false) {
if (setlocale(LC_ALL, $localeName . '.UTF-8') === false && setlocale(LC_ALL, $localeName) === false) {
setlocale(LC_ALL, 'C'); // C == "use whatever is hardcoded"
if ($localeName !== self::DEFAULT_LOCALE) {
throw new Exception("Cannot set locale '$localeName.UTF-8' for category 'LC_ALL'");
throw new Exception("Cannot set locale '$localeName' for category 'LC_ALL'");
}
} else {
putenv('LC_ALL=' . $localeName . '.UTF-8'); // Failsafe, Win and Unix
putenv('LANG=' . $localeName . '.UTF-8'); // Windows fix, untested
putenv('LC_ALL=' . setlocale(LC_ALL, 0)); // Failsafe, Win and Unix
putenv('LANG=' . setlocale(LC_ALL, 0)); // Windows fix, untested
}
}