tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-06-21 06:10:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Report the default language also as being available for setting up the locale

Browse Source 
fixes #6905
This commit is contained in:
Johannes Meyer 2014-08-14 10:48:52 +02:00
parent dc8181cdc5
commit 4ddc0e718b
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/forms/Config/GeneralForm.php
View File

@ -93,7 +93,6 @@ class GeneralForm extends Form
foreach (Translator::getAvailableLocaleCodes() as $language) { foreach (Translator::getAvailableLocaleCodes() as $language) {
$languages[$language] = $language; $languages[$language] = $language;
} }
$languages[Translator::DEFAULT_LOCALE] = Translator::DEFAULT_LOCALE;
$this->addElement( $this->addElement(
'select', 'select',

1
application/forms/Preference/GeneralForm.php
View File

@ -33,7 +33,6 @@ class GeneralForm extends Form
foreach (Translator::getAvailableLocaleCodes() as $language) { foreach (Translator::getAvailableLocaleCodes() as $language) {
$languages[$language] = $language; $languages[$language] = $language;
} }
$languages[Translator::DEFAULT_LOCALE] = Translator::DEFAULT_LOCALE;
$prefs = $this->getUserPreferences(); $prefs = $this->getUserPreferences();
$useDefaultLanguage = $this->getRequest()->getParam('default_language', !$prefs->has('app.language')); $useDefaultLanguage = $this->getRequest()->getParam('default_language', !$prefs->has('app.language'));

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

@ -115,7 +115,7 @@ class Translator
*/ */
public static function getAvailableLocaleCodes() public static function getAvailableLocaleCodes()
{ {
$codes = array(); $codes = array(static::DEFAULT_LOCALE);
foreach (array_values(self::$knownDomains) as $directory) { foreach (array_values(self::$knownDomains) as $directory) {
$dh = opendir($directory); $dh = opendir($directory);
while (false !== ($name = readdir($dh))) { while (false !== ($name = readdir($dh))) {