OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2916 from matrix-org/travis/guests/better-errors 

Add strings for js-sdk autodiscovery errors
pull/21833/head
Travis Ralston 2019-04-12 10:20:56 -06:00 committed by GitHub
parent c8bd2e7aa5 9d55d0c897
commit fa5c9f5683
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/structures/auth/Login.js
View File

@ -42,7 +42,12 @@ const PHASES_ENABLED = true;
// These are used in several places, and come from the js-sdk's autodiscovery // These are used in several places, and come from the js-sdk's autodiscovery
// stuff. We define them here so that they'll be picked up by i18n. // stuff. We define them here so that they'll be picked up by i18n.
_td("Invalid homeserver discovery response"); _td("Invalid homeserver discovery response");
_td("Failed to get autodiscovery configuration from server");
_td("Invalid base_url for m.homeserver");
_td("Homeserver URL does not appear to be a valid Matrix homeserver");
_td("Invalid identity server discovery response"); _td("Invalid identity server discovery response");
_td("Invalid base_url for m.identity_server");
_td("Identity server URL does not appear to be a valid identity server");
_td("General failure"); _td("General failure");
/** /**

5
src/i18n/strings/en_EN.json
View File

@ -1476,7 +1476,12 @@
"Return to login screen": "Return to login screen", "Return to login screen": "Return to login screen",
"Set a new password": "Set a new password", "Set a new password": "Set a new password",
"Invalid homeserver discovery response": "Invalid homeserver discovery response", "Invalid homeserver discovery response": "Invalid homeserver discovery response",
"Failed to get autodiscovery configuration from server": "Failed to get autodiscovery configuration from server",
"Invalid base_url for m.homeserver": "Invalid base_url for m.homeserver",
"Homeserver URL does not appear to be a valid Matrix homeserver": "Homeserver URL does not appear to be a valid Matrix homeserver",
"Invalid identity server discovery response": "Invalid identity server discovery response", "Invalid identity server discovery response": "Invalid identity server discovery response",
"Invalid base_url for m.identity_server": "Invalid base_url for m.identity_server",
"Identity server URL does not appear to be a valid identity server": "Identity server URL does not appear to be a valid identity server",
"General failure": "General failure", "General failure": "General failure",
"This homeserver does not support login using email address.": "This homeserver does not support login using email address.", "This homeserver does not support login using email address.": "This homeserver does not support login using email address.",
"Please <a>contact your service administrator</a> to continue using this service.": "Please <a>contact your service administrator</a> to continue using this service.", "Please <a>contact your service administrator</a> to continue using this service.": "Please <a>contact your service administrator</a> to continue using this service.",