Remove language selection from the general configuration

refs #6073
This commit is contained in:
Johannes Meyer 2014-06-25 13:21:05 +02:00
parent a94ef92cf7
commit 7ff4890ab7

View File

@ -106,36 +106,6 @@ class GeneralForm extends Form
} }
} }
/**
* Add a select field for setting the default language
*
* Possible values are determined by Translator::getAvailableLocaleCodes.
*
* @param Zend_Config $cfg The "global" section of the config.ini
*/
private function addLanguageSelection(Zend_Config $cfg)
{
$languages = array();
foreach (Translator::getAvailableLocaleCodes() as $language) {
$languages[$language] = $language;
}
$languages[Translator::DEFAULT_LOCALE] = Translator::DEFAULT_LOCALE;
$this->addElement(
'select',
'language',
array(
'label' => t('Default Language'),
'required' => true,
'multiOptions' => $languages,
'helptext' => t(
'Select the language to use by default. Can be overwritten by a user in his preferences.'
),
'value' => $cfg->get('language', Translator::DEFAULT_LOCALE)
)
);
}
/** /**
* Add a select field for setting the default timezone. * Add a select field for setting the default timezone.
* *
@ -259,7 +229,6 @@ class GeneralForm extends Form
$preferences = new Zend_Config(array()); $preferences = new Zend_Config(array());
} }
$this->setName('form_config_general'); $this->setName('form_config_general');
$this->addLanguageSelection($global);
$this->addTimezoneSelection($global); $this->addTimezoneSelection($global);
$this->addModuleSettings($global); $this->addModuleSettings($global);
$this->addUserPreferencesDialog($preferences); $this->addUserPreferencesDialog($preferences);
@ -284,7 +253,6 @@ class GeneralForm extends Form
$values = $this->getValues(); $values = $this->getValues();
$cfg = clone $config; $cfg = clone $config;
$cfg->global->language = $values['language'];
$cfg->global->timezone = $values['timezone']; $cfg->global->timezone = $values['timezone'];
$cfg->global->modulePath = $values['module_path']; $cfg->global->modulePath = $values['module_path'];
$cfg->preferences->type = $values['preferences_type']; $cfg->preferences->type = $values['preferences_type'];