felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-25 02:52:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ismail/5562_search_aggregations

Browse Source
This commit is contained in:
ismailgulek
2022-02-15 16:15:53 +03:00
parent 00b2734f48 0fe44bb480
commit 42ffda9918
19 changed files with 102 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings
+3 -3
View File
@@ -367,7 +367,7 @@
"notice_room_join" = "%@ joined";
"notice_room_leave" = "%@ left";
"notice_room_reject" = "%@ rejected the invitation";
"notice_room_kick" = "%@ kicked %@";
"notice_room_kick" = "%@ removed %@";
"notice_room_unban" = "%@ unbanned %@";
"notice_room_ban" = "%@ banned %@";
"notice_room_withdraw" = "%@ withdrew %@'s invitation";
@@ -399,7 +399,7 @@
"notice_room_join_by_you" = "You joined";
"notice_room_leave_by_you" = "You left";
"notice_room_reject_by_you" = "You rejected the invitation";
"notice_room_kick_by_you" = "You kicked %@";
"notice_room_kick_by_you" = "You removed %@";
"notice_room_unban_by_you" = "You unbanned %@";
"notice_room_ban_by_you" = "You banned %@";
"notice_room_withdraw_by_you" = "You withdrew %@'s invitation";
@@ -479,7 +479,7 @@
"num_members_one" = "%@ user";
"num_members_other" = "%@ users";
"invite" = "Invite";
"kick" = "Kick";
"kick" = "Remove from chat";
"ban" = "Ban";
"unban" = "Un-ban";
"message_unsaved_changes" = "There are unsaved changes. Leaving will discard them.";
Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
+1 -1
View File
@@ -955,7 +955,7 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
}
if (event.content[@"kick"])
{
displayText = [NSString stringWithFormat:@"%@\n\u2022 kick: %@", displayText, event.content[@"kick"]];
displayText = [NSString stringWithFormat:@"%@\n\u2022 remove: %@", displayText, event.content[@"kick"]];
}
if (event.content[@"redact"])
{