Merge branch 'feature/4857_translate_invalid_password_message' into 'develop'

MESSENGER-4857 translate invalid password message

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!212
This commit is contained in:
JanNiklas Grabowski
2023-09-15 11:03:49 +00:00
4 changed files with 23 additions and 3 deletions
+1
View File
@@ -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
+1
View File
@@ -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
+13 -1
View File
@@ -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")
}
@@ -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)
{