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/i18n | |
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/i18n')
-rw-r--r-- | webapp/i18n/en.json | 2 | ||||
-rw-r--r-- | webapp/i18n/es.json | 2 | ||||
-rw-r--r-- | webapp/i18n/i18n.jsx | 9 |
3 files changed, 9 insertions, 4 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index acc9325f9..435d25dfb 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -189,7 +189,7 @@ "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.availableLocalesDescription": "Determines which languages are available for users in Account Settings. (Leave it blank to have all supported languages available)", "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.", "admin.gitab.clientSecretDescription": "Obtain this value via the instructions above for logging into GitLab.", diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json index 97ac41a2e..85e7de39f 100644 --- a/webapp/i18n/es.json +++ b/webapp/i18n/es.json @@ -189,7 +189,7 @@ "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.availableLocalesDescription": "Determina qué idiomas están disponibles para los usuarios en la Configuración de la Cuenta. (al dejarlo en blanco se tienen disponibles todos los idiomas soportados.", "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.", "admin.gitab.clientSecretDescription": "Utilizar este valor vía instrucciones suministradas anteriormente para iniciar sesión en GitLab.", diff --git a/webapp/i18n/i18n.jsx b/webapp/i18n/i18n.jsx index 71356d75f..73838cb71 100644 --- a/webapp/i18n/i18n.jsx +++ b/webapp/i18n/i18n.jsx @@ -52,10 +52,15 @@ const languages = { let availableLanguages = null; function setAvailableLanguages() { - const available = global.window.mm_config.AvailableLocales.split(','); - + let available; availableLanguages = {}; + if (global.window.mm_config.AvailableLocales) { + available = global.window.mm_config.AvailableLocales.split(','); + } else { + available = Object.keys(languages); + } + available.forEach((l) => { if (languages[l]) { availableLanguages[l] = languages[l]; |