diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-09-05 17:40:35 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-09-05 17:40:35 -0400 |
commit | e30e4cfe3d787e2528419b0d17973eb0fc162d56 (patch) | |
tree | 8b6e989dccfe7308786167c0767f4699f28841ae /webapp/i18n/en.json | |
parent | 6ca443a2556e5d4bade9a9ef7d6d877bf1d6fc45 (diff) | |
download | chat-e30e4cfe3d787e2528419b0d17973eb0fc162d56.tar.gz chat-e30e4cfe3d787e2528419b0d17973eb0fc162d56.tar.bz2 chat-e30e4cfe3d787e2528419b0d17973eb0fc162d56.zip |
PLT-7468 Moved more error pages to use predefined error types (#7378)
* PLT-7468 Moved more errors to use error types
* PLT-7468 Moved 404 error page to use error types
* Made helper function for rendering external links on error page
Diffstat (limited to 'webapp/i18n/en.json')
-rwxr-xr-x | webapp/i18n/en.json | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 4bb9542ef..754620969 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1440,6 +1440,8 @@ "emoji_picker.recent": "Recently Used", "emoji_picker.search": "Search", "emoji_picker.symbols": "Symbols", + "error.generic.link": "Back to Mattermost", + "error.generic.message": "An error has occurred.", "error.local_storage.help1": "Enable cookies", "error.local_storage.help2": "Turn off private browsing", "error.local_storage.help3": "Use a supported browser (IE 11, Chrome 43+, Firefox 38+, Safari 9, Edge)", @@ -1447,6 +1449,15 @@ "error.not_found.link_message": "Back to Mattermost", "error.not_found.message": "The page you were trying to reach does not exist", "error.not_found.title": "Page not found", + "error.oauth_missing_code": "The service provider {service} did not provide an authorization code in the redirect URL.", + "error.oauth_missing_code.forum": "If you reviewed the above and are still having trouble with configuration, you may post in our {link} where we'll be happy to help with issues during setup.", + "error.oauth_missing_code.forum.link": "Troubleshooting forum", + "error.oauth_missing_code.gitlab": "For {link} please make sure you followed the setup instructions.", + "error.oauth_missing_code.gitlab.link": "GitLab", + "error.oauth_missing_code.google": "For {link} make sure your administrator enabled the Google+ API.", + "error.oauth_missing_code.google.link": "Google Apps", + "error.oauth_missing_code.office365": "For {link} make sure the administrator of your Microsoft organization has enabled the Mattermost app.", + "error.oauth_missing_code.office365.link": "Office 365", "error_bar.expired": "Enterprise license is expired and some features may be disabled. <a href='{link}' target='_blank'>Please renew</a>.", "error_bar.expiring": "Enterprise license expires on {date}. <a href='{link}' target='_blank'>Please renew</a>.", "error_bar.past_grace": "Enterprise license is expired and some features may be disabled. Please contact your System Administrator for details.", |