Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-04-23 12:20:13 +00:00
commit ef3e471766

View File

@ -58,7 +58,7 @@ function textForMemberEvent(ev) {
}); });
} else if (!prevContent.displayname && content.displayname) { } else if (!prevContent.displayname && content.displayname) {
return _t('%(senderName)s set their display name to %(displayName)s.', { return _t('%(senderName)s set their display name to %(displayName)s.', {
senderName, senderName: ev.getSender(),
displayName: content.displayname, displayName: content.displayname,
}); });
} else if (prevContent.displayname && !content.displayname) { } else if (prevContent.displayname && !content.displayname) {