Merge branch 'feature/5716_change_error_message_federation_invite' into 'develop'

Feature/5716 change error message federation invite

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!377

Riot/Assets/de.lproj/Bwi.strings

@@ -743,3 +743,5 @@
 "introduce_federation_screen3_title" = "Individuelle Einstellung";
 "introduce_federation_screen3_description" = "Bestimme als Admin, welche Räume für eine Föderation zugelassen sind.";
 "introduce_federation_start" = "Verstanden";
+
+"room_error_join_failed_federation_disabled_message" = "Du kannst den Raum nicht beitreten. Grund: Die Föderation wurde für diesen Raum aufgehoben.";

Riot/Assets/en.lproj/Bwi.strings

@@ -656,3 +656,5 @@
 "introduce_federation_screen3_title" = "Individual settings";
 "introduce_federation_screen3_description" = "Decide as an admin which room should be authorized for federation.";
 "introduce_federation_start" = "Understood";
+
+"room_error_join_failed_federation_disabled_message" = "You cannot join the room. The federation for this room has been withdrawn.";

Riot/Generated/BWIStrings.swift

@@ -1371,6 +1371,10 @@ public class BWIL10n: NSObject {
   public static var roomDetailsTitleForDm: String { 
     return BWIL10n.tr("Bwi", "room_details_title_for_dm") 
   }
+  /// Du kannst den Raum nicht beitreten. Grund: Die Föderation wurde für diesen Raum aufgehoben.
+  public static var roomErrorJoinFailedFederationDisabledMessage: String { 
+    return BWIL10n.tr("Bwi", "room_error_join_failed_federation_disabled_message") 
+  }
   /// Umfrage beenden
   public static var roomEventActionEndPoll: String { 
     return BWIL10n.tr("Bwi", "room_event_action_end_poll") 

Riot/Modules/Common/Recents/RecentsViewController.m

@@ -567,6 +567,9 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
         // minging kludge until https://matrix.org/jira/browse/SYN-678 is fixed
         // 'Error when trying to join an empty room should be more explicit'
         msg = [VectorL10n roomErrorJoinFailedEmptyRoom];
+    } else if ([msg isEqualToString:@"Server is banned from room"]) // bwi: #5716 show custom error message when the federation was disabled after the user has been invited to a federated room
+    {
+        msg = BWIL10n.roomErrorJoinFailedFederationDisabledMessage;
     }
     
     [self->currentAlert dismissViewControllerAnimated:NO completion:nil];

Riot/Modules/ContextMenu/Services/UnownedRoomContextActionService.swift

@@ -81,6 +81,8 @@ class UnownedRoomContextActionService: NSObject, RoomContextActionServiceProtoco
             // minging kludge until https://matrix.org/jira/browse/SYN-678 is fixed
             // 'Error when trying to join an empty room should be more explicit'
             message = VectorL10n.roomErrorJoinFailedEmptyRoom
+        } else if message == "Server is banned from room" {  // bwi: #5716 show custom error message when the federation was disabled after the user has been invited to a federated room
+            message = BWIL10n.roomErrorJoinFailedFederationDisabledMessage
         }
         
         let alertController = UIAlertController(title: VectorL10n.roomErrorJoinFailedTitle, message: message, preferredStyle: .alert)

Riot/Modules/Room/MXKRoomViewController.m

@@ -992,6 +992,10 @@ static const CGFloat kCellVisibilityMinimumHeight = 8.0;
         // 'Error when trying to join an empty room should be more explicit'
         msg = [VectorL10n roomErrorJoinFailedEmptyRoom];
     }
+    else if ([msg isEqualToString:@"Server is banned from room"]) // bwi: #5716 show custom error message when the federation was disabled after the user has been invited to a federated room
+    {
+        msg = BWIL10n.roomErrorJoinFailedFederationDisabledMessage;
+    }
     
     MXWeakify(self);
     [self->currentAlert dismissViewControllerAnimated:NO completion:nil];