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

Web: Detect preferred locale using ipl-i18n

Browse Source
This commit is contained in:
Johannes Meyer 2021-05-20 09:47:17 +02:00
parent 86614ad7a8
commit db1fea6331
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,9 +496,7 @@ class Web extends EmbeddedWeb
*
* Uses the preferred user language or the browser suggested language or our default.
*
* @return string Detected locale code
*
* @see Translator::DEFAULT_LOCALE For the default locale code.
* @return string Detected locale code
*/
protected function detectLocale()
{
@ -508,9 +506,14 @@ class Web extends EmbeddedWeb
) {
return $locale;
}
/** @var GettextTranslator $translator */
$translator = StaticTranslator::$instance;
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
return Translator::getPreferredLocaleCode($_SERVER['HTTP_ACCEPT_LANGUAGE']);
return (new Locale())->getPreferred($_SERVER['HTTP_ACCEPT_LANGUAGE'], $translator->listLocales());
}
return Translator::DEFAULT_LOCALE;
return $translator->getDefaultLocale();
}
}