summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorAlex Moon <moonmeister@users.noreply.github.com>2017-09-06 13:23:14 -0700
committerChristopher Speller <crspeller@gmail.com>2017-09-06 13:23:14 -0700
commitcb266eb942789dc60e6b61ec9c7f2e35e43de0ce (patch)
treeac936afb13ea394199495d3463d697887c24879d /i18n
parent66a4d0112587608533aa744578d2db18bd88db56 (diff)
downloadchat-cb266eb942789dc60e6b61ec9c7f2e35e43de0ce.tar.gz
chat-cb266eb942789dc60e6b61ec9c7f2e35e43de0ce.tar.bz2
chat-cb266eb942789dc60e6b61ec9c7f2e35e43de0ce.zip
[PLT-959] Browser Compatibility (#6945)
* Error page implimentation * Update Browser Compatibility check to check Chrome, FF, IE, Edge, and Safai * Update strings with proper edge version * undo uneeded changes and move to go template. * more unneeded additions * eliminate js and add local triangle * fix typo * Correct debug logging of browser version * Modify Browser Check to pass user_agent object only and write test. * Fix chrome version typo and correct testing change that broke chrome UA chack * simplity browser version detection by using maps instead of string splitting
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json56
1 files changed, 28 insertions, 28 deletions
diff --git a/i18n/en.json b/i18n/en.json
index ef839b4fd..7503ca8e8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3972,30 +3972,6 @@
"translation": "Unable to update existing SAML user. Allowing login anyway. err=%v"
},
{
- "id": "error.generic.link_message",
- "translation": "Back to Mattermost"
- },
- {
- "id": "error.generic.message",
- "translation": "An error has occurred."
- },
- {
- "id": "error.generic.title",
- "translation": "Error"
- },
- {
- "id": "error.not_found.link_message",
- "translation": "Back to Mattermost"
- },
- {
- "id": "error.not_found.message",
- "translation": "The page you were trying to reach does not exist."
- },
- {
- "id": "error.not_found.title",
- "translation": "Page not found"
- },
- {
"id": "jobs.request_cancellation.status.error",
"translation": "Could not request cancellation for job that is not in a cancelable state."
},
@@ -6668,10 +6644,6 @@
"translation": "Authorize Application"
},
{
- "id": "web.check_browser_compatibility.app_error",
- "translation": "Your current browser is not supported, please upgrade to one of the following browsers: Google Chrome 21 or higher, Internet Explorer 11 or higher, Firefox 14 or higher, Safari 9 or higher"
- },
- {
"id": "web.claim_account.team.error",
"translation": "Couldn't find team name=%v, err=%v"
},
@@ -6716,6 +6688,34 @@
"translation": "Email Verified"
},
{
+ "id": "web.error.unsupported_browser.title",
+ "translation": "Unsupported Browser"
+ },
+ {
+ "id": "web.error.unsupported_browser.message",
+ "translation": "Your current browser is not supported. Please upgrade to one of the following browsers:"
+ },
+ {
+ "id": "web.error.unsupported_browser.help1",
+ "translation": "Google Chrome 43+"
+ },
+ {
+ "id": "web.error.unsupported_browser.help2",
+ "translation": "Mozzilla Firefox 52+"
+ },
+ {
+ "id": "web.error.unsupported_browser.help3",
+ "translation": "Microsoft Internet Explorer 11+"
+ },
+ {
+ "id": "web.error.unsupported_browser.help4",
+ "translation": "Microsoft Edge 40+"
+ },
+ {
+ "id": "web.error.unsupported_browser.help5",
+ "translation": "Apple Safari 9+"
+ },
+ {
"id": "web.find_team.title",
"translation": "Find Team"
},