summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-09-06 08:29:14 -0400
committerGitHub <noreply@github.com>2016-09-06 08:29:14 -0400
commitdda0ea355283623cf9bf3f5d16f3a3c3033106ae (patch)
tree83e51c84873f38a05407592b050c726ff76fb6b3 /i18n
parenta3ea88441986c4c655e4590b96ebdc2712ae7028 (diff)
downloadchat-dda0ea355283623cf9bf3f5d16f3a3c3033106ae.tar.gz
chat-dda0ea355283623cf9bf3f5d16f3a3c3033106ae.tar.bz2
chat-dda0ea355283623cf9bf3f5d16f3a3c3033106ae.zip
PLT-3875 Update error page to use Markdown and add error for missing OAuth code (#3934)
* Update error page to use Markdown and add error for missing OAuth code * Add line breaks to error messages This is to make the error message easier to read. * Update en.json
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/i18n/en.json b/i18n/en.json
index d0c5b85a1..339c58e36 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1010,8 +1010,8 @@
"translation": "invalid_request: Bad client_id"
},
{
- "id": "api.oauth.receive_redirect.debug",
- "translation": "OAuth2 redirect: {{.URL}}"
+ "id": "api.oauth.complete_oauth.missing_code.app_error",
+ "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
},
{
"id": "api.oauth.allow_oauth.bad_redirect.app_error",