mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-18 14:44:58 +08:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
ef3e471766
@ -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) {
|
||||||
|
Loading…
Reference in New Issue
Block a user