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

Merge pull request #185 from matrix-org/dbkr/threepid_invite_wording 

Fix 3pid invite acceptance with desired wording.
pull/21833/head
David Baker 2016-03-04 11:37:55 +00:00
parent 05a3dab528 82cdc15faf
commit 4a3053a90b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/TextForEvent.js
View File

@ -11,11 +11,12 @@ function textForMemberEvent(ev) {
case 'invite':
var threePidContent = ev.getContent().third_party_invite;
if (threePidContent) {
// TODO: When we have third_party_invite.display_name we should
// do this as "$displayname received the invitation from $sender"
// or equiv
return targetName + " received an invitation from " + senderName +
".";
if (threePidContent.display_name) {
return targetName + " accepted the invitation for " +
threePidContent.display_name + ".";
} else {
return targetName + " accepted an invitation.";
}
}
else {
return senderName + " invited " + targetName + ".";