diff options
author | enahum <nahumhbl@gmail.com> | 2016-06-15 09:10:38 -0300 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-15 08:10:38 -0400 |
commit | 3f4d38f58ae086c6570bea7082f25cbdbc52c85d (patch) | |
tree | c83e3fffb591a702fe70b2da4465e89d1a011f5a /webapp/components/admin_console/localization_settings.jsx | |
parent | c7e9f3cb1b9cedb328da28aa5f4237fdc325e68c (diff) | |
download | chat-3f4d38f58ae086c6570bea7082f25cbdbc52c85d.tar.gz chat-3f4d38f58ae086c6570bea7082f25cbdbc52c85d.tar.bz2 chat-3f4d38f58ae086c6570bea7082f25cbdbc52c85d.zip |
PLT-3344 Set Localization config to always have by default all languages available (#3339)
Diffstat (limited to 'webapp/components/admin_console/localization_settings.jsx')
-rw-r--r-- | webapp/components/admin_console/localization_settings.jsx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/webapp/components/admin_console/localization_settings.jsx b/webapp/components/admin_console/localization_settings.jsx index 7987f77dc..67cf26fee 100644 --- a/webapp/components/admin_console/localization_settings.jsx +++ b/webapp/components/admin_console/localization_settings.jsx @@ -26,7 +26,7 @@ export default class LocalizationSettings extends AdminSettings { hasErrors: false, defaultServerLocale: props.config.LocalizationSettings.DefaultServerLocale, defaultClientLocale: props.config.LocalizationSettings.DefaultClientLocale, - availableLocales: props.config.LocalizationSettings.AvailableLocales.split(','), + availableLocales: props.config.LocalizationSettings.AvailableLocales ? props.config.LocalizationSettings.AvailableLocales.split(',') : [], languages: Object.keys(locales).map((l) => { return {value: locales[l].value, text: locales[l].name}; }) @@ -34,7 +34,7 @@ export default class LocalizationSettings extends AdminSettings { } canSave() { - return this.state.availableLocales.join(',').indexOf(this.state.defaultClientLocale) !== -1; + return this.state.availableLocales.join(',').indexOf(this.state.defaultClientLocale) !== -1 || this.state.availableLocales.length === 0; } getConfigFromState(config) { @@ -112,12 +112,11 @@ export default class LocalizationSettings extends AdminSettings { /> } selected={this.state.availableLocales} - mustBePresent={this.state.defaultClientLocale} onChange={this.handleChange} helpText={ <FormattedMessage id='admin.general.localization.availableLocalesDescription' - defaultMessage='Determines which languages are available for users in Account Settings.' + defaultMessage='Determines which languages are available for users in Account Settings. (Leave it blank to have all supported languages available)' /> } noResultText={ @@ -126,12 +125,6 @@ export default class LocalizationSettings extends AdminSettings { defaultMessage='No results found' /> } - errorText={ - <FormattedMessage - id='admin.general.localization.availableLocalesError' - defaultMessage='There has to be at least one language available' - /> - } notPresent={ <FormattedMessage id='admin.general.localization.availableLocalesNotPresent' |