matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Merge branch 'develop' into luke/ilag-i18n

Browse Source 
In order to get ILAG internationalised

Conflicts:
	src/components/structures/LoggedInView.js
	src/components/structures/MatrixChat.js
	src/components/views/dialogs/ChatCreateOrReuseDialog.js
	src/components/views/dialogs/SetDisplayNameDialog.js
	src/createRoom.js
	src/i18n/strings/en_EN.json
This commit is contained in:
Luke Barnard
2017-06-05 16:08:03 +01:00
parent 6125395675 c5cd6aecd6
commit 619830617a
79 changed files with 3924 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/createRoom.js
View File

@@ -107,7 +107,7 @@ function createRoom(opts) {
console.error("Failed to create room " + roomId + " " + err);
Modal.createDialog(ErrorDialog, {
title: _t("Failure to create room"),
description: _t("Server may be unavailable, overloaded, or you hit a bug") + ".",
description: _t("Server may be unavailable, overloaded, or you hit a bug."),
});
return null;
});