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

Merge pull request #1510 from matrix-org/dbkr/fix_dms 

Fix creation of DM rooms
pull/21833/head
Luke Barnard 2017-10-20 11:01:28 +01:00 committed by GitHub
parent a85a011db9 f829012045
commit f15bf8931a
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/RoomInvite.js
View File

@ -127,7 +127,7 @@ function _onRoomInviteFinished(roomId, shouldInvite, addrs) {
}
function _isDmChat(addrTexts) {
if (addrTexts.length === 1 && getAddressType(addrTexts[0]) === 'mx') {
if (addrTexts.length === 1 && getAddressType(addrTexts[0]) === 'mx-user-id') {
return true;
} else {
return false;

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

@ -582,9 +582,7 @@
"Confirm Removal": "Confirm Removal",
"Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
"%(actionVerb)s this person?": "%(actionVerb)s this person?",
"Community IDs must be of the form +localpart:%(domain)s": "Community IDs must be of the form +localpart:%(domain)s",
"Community IDs may only contain alphanumeric characters": "Community IDs may only contain alphanumeric characters",
"It is currently only possible to create communities on your own home server: use a community ID ending with %(domain)s": "It is currently only possible to create communities on your own home server: use a community ID ending with %(domain)s",
"Room creation failed": "Room creation failed",
"Create Community": "Create Community",
"Community Name": "Community Name",