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

PreferenceForm: Detect locales using ipl-i18n

This commit is contained in:
Johannes Meyer 2021-05-20 09:48:03 +02:00
parent db1fea6331
commit 573af6b2df
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
application/forms/PreferenceForm.php
View File

@ -12,12 +12,13 @@ use Icinga\Authentication\Auth;
use Icinga\User\Preferences;
use Icinga\User\Preferences\PreferencesStore;
use Icinga\Util\TimezoneDetect;
use Icinga\Util\Translator;
use Icinga\Web\Cookie;
use Icinga\Web\Form;
use Icinga\Web\Notification;
use Icinga\Web\Session;
use Icinga\Web\StyleSheet;
use ipl\I18n\GettextTranslator;
use ipl\I18n\Locale;
use ipl\I18n\StaticTranslator;
/**
* Form class to adjust user preferences
@ -201,14 +202,18 @@ class PreferenceForm extends Form
}
}
$languages = array();
/** @var GettextTranslator $translator */
$translator = StaticTranslator::$instance;
$locale = $this->getLocale();
$languages = array();
$availableLocales = $translator->listLocales();
$locale = $this->getLocale($availableLocales);
if ($locale !== null) {
$languages['autodetect'] = sprintf($this->translate('Browser (%s)', 'preferences.form'), $locale);
}
foreach (Translator::getAvailableLocaleCodes() as $language) {
foreach ($availableLocales as $language) {
$languages[$language] = $language;
}
@ -410,10 +415,10 @@ class PreferenceForm extends Form
*
* @return string|null
*/
protected function getLocale()
protected function getLocale($availableLocales)
{
return isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])
? Translator::getPreferredLocaleCode($_SERVER['HTTP_ACCEPT_LANGUAGE'])
? (new Locale())->getPreferred($_SERVER['HTTP_ACCEPT_LANGUAGE'], $availableLocales)
: null;
}