diff options
| author | enahum <nahumhbl@gmail.com> | 2016-06-09 12:08:27 -0300 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-09 11:08:27 -0400 |
| commit | eefde7d7b6231d2ba143aa496f698d0c9f758bdd (patch) | |
| tree | 512fc37ada618597e2d01a003b351f0d91774476 /webapp | |
| parent | 1b2fd5af5e55b6da3a2da5534570f357b0c643f3 (diff) | |
| download | chat-eefde7d7b6231d2ba143aa496f698d0c9f758bdd.tar.gz chat-eefde7d7b6231d2ba143aa496f698d0c9f758bdd.tar.bz2 chat-eefde7d7b6231d2ba143aa496f698d0c9f758bdd.zip | |
PLT-3236 Click in little x for admin console localization settings causes error (#3292)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/multiselect_settings.jsx | 1 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 2 | ||||
| -rw-r--r-- | webapp/i18n/es.json | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/webapp/components/admin_console/multiselect_settings.jsx b/webapp/components/admin_console/multiselect_settings.jsx index deba983de..ca0bdc9aa 100644 --- a/webapp/components/admin_console/multiselect_settings.jsx +++ b/webapp/components/admin_console/multiselect_settings.jsx @@ -50,6 +50,7 @@ export default class MultiSelectSetting extends React.Component { labelKey='text' options={this.props.values} joinValues={true} + clearable={false} disabled={this.props.disabled} noResultsText={this.props.noResultText} onChange={this.handleChange} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 783aea863..1883b234a 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -180,6 +180,7 @@ "admin.email.smtpUsernameTitle": "SMTP Username:", "admin.email.testing": "Testing...", "admin.false": "false", + "admin.general.localization": "Localization", "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings.", "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.", "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.", @@ -430,6 +431,7 @@ "admin.sidebar.integrations": "Integrations", "admin.sidebar.ldap": "LDAP", "admin.sidebar.license": "Edition and License", + "admin.sidebar.localization": "Localization", "admin.sidebar.logging": "Logging", "admin.sidebar.login": "Login", "admin.sidebar.logs": "Logs", diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json index 4e3b4d916..95ef986db 100644 --- a/webapp/i18n/es.json +++ b/webapp/i18n/es.json @@ -180,6 +180,7 @@ "admin.email.smtpUsernameTitle": "Usuario SMTP:", "admin.email.testing": "Probando...", "admin.false": "falso", + "admin.general.localization": "Idiomas", "admin.general.localization.availableLocalesDescription": "Determina qué idiomas están disponibles para los usuarios en la Configuración de la Cuenta.", "admin.general.localization.clientLocaleDescription": "Idioma predeterminado para nuevos usuarios y páginas donde el usuario no ha iniciado sesión.", "admin.general.localization.serverLocaleDescription": "Idioma predeterminado para los mensajes del sistema y los registros. Cambiar esto requerirá un reinicio del servidor antes de tomar efecto.", @@ -430,6 +431,7 @@ "admin.sidebar.integrations": "Integraciones", "admin.sidebar.ldap": "LDAP", "admin.sidebar.license": "Edición y Licencia", + "admin.sidebar.localization": "Idiomas", "admin.sidebar.logging": "Registros", "admin.sidebar.login": "Inicio de Sesión", "admin.sidebar.logs": "Registros", |