mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 15:22:39 +00:00
Merge pull request #7519 from vector-im/nimau/7517_matrix_id_notice_events
Fix: Remove the matrix id from the notice display name changed event
This commit is contained in:
commit
8ecfcd3e5a
4 changed files with 7 additions and 1 deletions
|
@ -2984,6 +2984,7 @@ To enable access, tap Settings> Location and select Always";
|
|||
"notice_avatar_url_changed" = "%@ changed their avatar";
|
||||
"notice_display_name_set" = "%@ set their display name to %@";
|
||||
"notice_display_name_changed_from" = "%@ changed their display name from %@ to %@";
|
||||
"notice_display_name_changed_to" = "%@ changed their display name to %@";
|
||||
"notice_display_name_removed" = "%@ removed their display name";
|
||||
"notice_topic_changed" = "%@ changed the topic to \"%@\".";
|
||||
"notice_room_name_changed" = "%@ changed the room name to %@.";
|
||||
|
|
|
@ -3899,6 +3899,10 @@ public class VectorL10n: NSObject {
|
|||
public static func noticeDisplayNameChangedFromByYou(_ p1: String, _ p2: String) -> String {
|
||||
return VectorL10n.tr("Vector", "notice_display_name_changed_from_by_you", p1, p2)
|
||||
}
|
||||
/// %@ changed their display name to %@
|
||||
public static func noticeDisplayNameChangedTo(_ p1: String, _ p2: String) -> String {
|
||||
return VectorL10n.tr("Vector", "notice_display_name_changed_to", p1, p2)
|
||||
}
|
||||
/// %@ removed their display name
|
||||
public static func noticeDisplayNameRemoved(_ p1: String) -> String {
|
||||
return VectorL10n.tr("Vector", "notice_display_name_removed", p1)
|
||||
|
|
|
@ -571,7 +571,7 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
|
|||
}
|
||||
else
|
||||
{
|
||||
displayText = [VectorL10n noticeDisplayNameChangedFrom:event.sender :prevDisplayname :displayname];
|
||||
displayText = [VectorL10n noticeDisplayNameChangedTo:prevDisplayname :displayname];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
1
changelog.d/7517.change
Normal file
1
changelog.d/7517.change
Normal file
|
@ -0,0 +1 @@
|
|||
Timeline: Remove the matrix ID displayed when someone has changed its display name.
|
Loading…
Reference in a new issue