summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-08-06 06:45:46 +0800
committerGitHub <noreply@github.com>2017-08-06 06:45:46 +0800
commit9f3713aa98011596a62315fd3b96fa2e77044081 (patch)
treeb19f16ac6cd421d6540f7c8b6495fceb29838524 /i18n
parent2ab2baba5899758b909e8ce80479d497eea4c80c (diff)
downloadchat-9f3713aa98011596a62315fd3b96fa2e77044081.tar.gz
chat-9f3713aa98011596a62315fd3b96fa2e77044081.tar.bz2
chat-9f3713aa98011596a62315fd3b96fa2e77044081.zip
[PLT-7231/PLT-7306] Fix GitLab SSO failure with non-English locale and make config locales more forgiving (#7125)
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json10
1 files changed, 9 insertions, 1 deletions
diff --git a/i18n/en.json b/i18n/en.json
index dccc62441..4769d2614 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6508,8 +6508,16 @@
"translation": "An error occurred while saving the file to {{.Filename}}"
},
{
+ "id": "utils.config.add_client_locale.app_error",
+ "translation": "Unable to load mattermost configuration file: Adding DefaultClientLocale to AvailableLocales."
+ },
+ {
+ "id": "utils.config.supported_available_locales.app_error",
+ "translation": "Unable to load mattermost configuration file: AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+ },
+ {
"id": "utils.config.supported_client_locale.app_error",
- "translation": "Unable to load mattermost configuration file: DefaultClientLocale must be one of the supported locales"
+ "translation": "Unable to load mattermost configuration file: DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
},
{
"id": "utils.config.supported_server_locale.app_error",