imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into travis/sort-i18n-2

Browse source
This commit is contained in:
Travis Ralston 2018-12-05 13:58:18 -07:00
commit 79ad95c853
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/i18n/strings/en_EN.json
View file

@ -225,6 +225,7 @@
"You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.", "You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.",
"User %(user_id)s does not exist": "User %(user_id)s does not exist", "User %(user_id)s does not exist": "User %(user_id)s does not exist",
"Unknown server error": "Unknown server error", "Unknown server error": "Unknown server error",
"There was an error joining the room": "There was an error joining the room",
"Use a few words, avoid common phrases": "Use a few words, avoid common phrases", "Use a few words, avoid common phrases": "Use a few words, avoid common phrases",
"No need for symbols, digits, or uppercase letters": "No need for symbols, digits, or uppercase letters", "No need for symbols, digits, or uppercase letters": "No need for symbols, digits, or uppercase letters",
"Use a longer keyboard pattern with more turns": "Use a longer keyboard pattern with more turns", "Use a longer keyboard pattern with more turns": "Use a longer keyboard pattern with more turns",

5
src/stores/RoomViewStore.js
View file

@ -224,6 +224,11 @@ class RoomViewStore extends Store {
err: err, err: err,
}); });
let msg = err.message ? err.message : JSON.stringify(err); let msg = err.message ? err.message : JSON.stringify(err);
// XXX: We are relying on the error message returned by browsers here.
// This isn't great, but it does generalize the error being shown to users.
if (msg && msg.startsWith("CORS request rejected")) {
msg = _t("There was an error joining the room");
}
if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') { if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
msg = <div> msg = <div>
{_t("Sorry, your homeserver is too old to participate in this room.")}<br /> {_t("Sorry, your homeserver is too old to participate in this room.")}<br />