sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki 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
test/i18n/languages.json
+4 -1
View File
@@ -1,3 +1,6 @@
{
"en": "en_EN.json"
"en": {
"fileName": "en_EN.json",
"label": "English"
}
}