From 2866d841e347dfdd0aef6e639678dafbefc2c854 Mon Sep 17 00:00:00 2001
From: JanNiklas Grabowski <janniklas.grabowski.ext@bwi.de>
Date: Fri, 15 Sep 2023 11:35:08 +0200
Subject: [PATCH 1/2] MESSENGER-4857 translate invalid password message

---
 Riot/Assets/de.lproj/Bwi.strings                       |  1 +
 Riot/Assets/en.lproj/Bwi.strings                       |  1 +
 .../ErrorPresentation/MXKErrorPresentableBuilder.m     | 10 ++++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Riot/Assets/de.lproj/Bwi.strings b/Riot/Assets/de.lproj/Bwi.strings
index 45fd12cf6..d16096b0b 100644
--- a/Riot/Assets/de.lproj/Bwi.strings
+++ b/Riot/Assets/de.lproj/Bwi.strings
@@ -506,6 +506,7 @@
 "bwi_error_invite_banned_in_room" = "%@ ist vom Raum gebannt.";
 "bwi_error_invite_general" = "%@ konnte nicht eingeladen werden.";
 "bwi_error_logout_offline" = "Abmelden ist ohne Internetverbindung nicht möglich.";
+"bwi_error_invalid_password" = "Falsches Passwort";
 
 // MARK: - Matomo
 
diff --git a/Riot/Assets/en.lproj/Bwi.strings b/Riot/Assets/en.lproj/Bwi.strings
index d85825e88..b9a5dc061 100644
--- a/Riot/Assets/en.lproj/Bwi.strings
+++ b/Riot/Assets/en.lproj/Bwi.strings
@@ -415,6 +415,7 @@
 "bwi_error_invite_banned_in_room" = "%@ is banned from the room.";
 "bwi_error_invite_general" = "%@ could not be invited.";
 "bwi_error_logout_offline" = "Logout not possible without internet connection.";
+"bwi_error_invalid_password" = "Invalid password";
 
 // MARK: - Matomo
 
diff --git a/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentableBuilder.m b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentableBuilder.m
index 077fb7001..c4119f883 100644
--- a/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentableBuilder.m
+++ b/Riot/Modules/MatrixKit/Utils/ErrorPresentation/MXKErrorPresentableBuilder.m
@@ -41,8 +41,14 @@
     }
     else
     {
-        title = [error.userInfo valueForKey:NSLocalizedFailureReasonErrorKey];
-        message = [error.userInfo valueForKey:NSLocalizedDescriptionKey];
+        // bwi: #4857 translate invalid password error message
+        if ([error.domain isEqualToString:kMXNSErrorDomain] && [[error.userInfo valueForKey:NSLocalizedDescriptionKey] isEqualToString: @"Invalid username or password"]) {
+            title = [error.userInfo valueForKey:NSLocalizedFailureReasonErrorKey];
+            message = [BWIL10n bwiErrorInvalidPassword];
+        } else {
+            title = [error.userInfo valueForKey:NSLocalizedFailureReasonErrorKey];
+            message = [error.userInfo valueForKey:NSLocalizedDescriptionKey];
+        }
         
         if (!title)
         {

From 7a2d1cb5da48bc8ba502ffedde7e63c866ba6e80 Mon Sep 17 00:00:00 2001
From: JanNiklas Grabowski <janniklas.grabowski.ext@bwi.de>
Date: Fri, 15 Sep 2023 12:15:22 +0200
Subject: [PATCH 2/2] fix pipeline

---
 Riot/Generated/BWIStrings.swift | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Riot/Generated/BWIStrings.swift b/Riot/Generated/BWIStrings.swift
index 7c7d639fb..ae7f13208 100644
--- a/Riot/Generated/BWIStrings.swift
+++ b/Riot/Generated/BWIStrings.swift
@@ -15,6 +15,10 @@ public class BWIL10n: NSObject {
   public static var allChatsEditLayoutShowPersonalNotes: String { 
     return BWIL10n.tr("Bwi", "all_chats_edit_layout_show_personal_notes") 
   }
+  /// Suche
+  public static var allChatsSearchbarPrompt: String { 
+    return BWIL10n.tr("Bwi", "all_chats_searchbar_prompt") 
+  }
   /// Passwort vergessen?
   public static var authForgotPassword: String { 
     return BWIL10n.tr("Bwi", "auth_forgot_password") 
@@ -207,6 +211,10 @@ public class BWIL10n: NSObject {
   public static var bwiEditPersonalStateTitle: String { 
     return BWIL10n.tr("Bwi", "bwi_edit_personal_state_title") 
   }
+  /// Falsches Passwort
+  public static var bwiErrorInvalidPassword: String { 
+    return BWIL10n.tr("Bwi", "bwi_error_invalid_password") 
+  }
   /// %@ ist bereits im Raum.
   public static func bwiErrorInviteAlreadyInRoom(_ p1: String) -> String {
     return BWIL10n.tr("Bwi", "bwi_error_invite_already_in_room", p1)
@@ -739,6 +747,10 @@ public class BWIL10n: NSObject {
   public static var e2eKeyBackupWrongVersion: String { 
     return BWIL10n.tr("Bwi", "e2e_key_backup_wrong_version") 
   }
+  /// Notizen ausblenden
+  public static var homeContextMenuPersonalNotes: String { 
+    return BWIL10n.tr("Bwi", "home_context_menu_personal_notes") 
+  }
   /// Die Verbindung zum Heimserver ist fehlgeschlagen.
   public static var homeserverConnectionLost: String { 
     return BWIL10n.tr("Bwi", "homeserver_connection_lost") 
@@ -1019,7 +1031,7 @@ public class BWIL10n: NSObject {
   public static var pollParticipantDetailsTitle: String { 
     return BWIL10n.tr("Bwi", "poll_participant_details_title") 
   }
-  /// Stimmen anzeigen
+  /// Stimmen ansehen
   public static var pollTimelineShowParticipantsButton: String { 
     return BWIL10n.tr("Bwi", "poll_timeline_show_participants_button") 
   }