From c566c64c78f9c19de945de3a057e2bc708a7b16f Mon Sep 17 00:00:00 2001 From: Mauro <34335419+Velin92@users.noreply.github.com> Date: Tue, 3 Dec 2024 17:21:02 +0100 Subject: [PATCH] added historical message error label string (#3580) --- .../Localizations/en.lproj/Localizable.strings | 8 ++++++++ ElementX/Sources/Generated/Strings.swift | 16 ++++++++++++++++ .../TimelineItems/RoomTimelineItemFactory.swift | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings index 9abc9ec077..acaa2e5126 100644 --- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings @@ -586,6 +586,11 @@ "screen_login_form_header" = "Enter your details"; "screen_login_title" = "Welcome back!"; "screen_login_title_with_homeserver" = "Sign in to %1$@"; +"screen_media_browser_empty_state_subtitle" = "Images and videos uploaded to this room will be shown here."; +"screen_media_browser_empty_state_title" = "No media uploaded yet"; +"screen_media_browser_list_mode_files" = "Files"; +"screen_media_browser_list_mode_media" = "Media"; +"screen_media_browser_title" = "Media and files"; "screen_media_picker_error_failed_selection" = "Failed selecting media, please try again."; "screen_migration_message" = "This is a one time process, thanks for waiting."; "screen_migration_title" = "Setting up your account."; @@ -986,6 +991,9 @@ "state_event_room_unknown_membership_change" = "%1$@ made an unknown change to their membership"; "test_language_identifier" = "en"; "test_untranslated_default_language_identifier" = "en"; +"timeline_decryption_failure_historical_event_no_key_backup" = "Historical messages are not available on this device"; +"timeline_decryption_failure_unable_to_decrypt" = "Unable to decrypt message"; +"timeline_decryption_failure_withheld_unverified" = "This message was blocked either because you did not verify your device or because the sender needs to verify your identity."; "troubleshoot_notifications_entry_point_section" = "Troubleshoot"; "troubleshoot_notifications_screen_action" = "Run tests"; "troubleshoot_notifications_screen_action_again" = "Run tests again"; diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift index cb7e231c6d..9b3db9c092 100644 --- a/ElementX/Sources/Generated/Strings.swift +++ b/ElementX/Sources/Generated/Strings.swift @@ -1356,6 +1356,16 @@ internal enum L10n { internal static func screenLoginTitleWithHomeserver(_ p1: Any) -> String { return L10n.tr("Localizable", "screen_login_title_with_homeserver", String(describing: p1)) } + /// Images and videos uploaded to this room will be shown here. + internal static var screenMediaBrowserEmptyStateSubtitle: String { return L10n.tr("Localizable", "screen_media_browser_empty_state_subtitle") } + /// No media uploaded yet + internal static var screenMediaBrowserEmptyStateTitle: String { return L10n.tr("Localizable", "screen_media_browser_empty_state_title") } + /// Files + internal static var screenMediaBrowserListModeFiles: String { return L10n.tr("Localizable", "screen_media_browser_list_mode_files") } + /// Media + internal static var screenMediaBrowserListModeMedia: String { return L10n.tr("Localizable", "screen_media_browser_list_mode_media") } + /// Media and files + internal static var screenMediaBrowserTitle: String { return L10n.tr("Localizable", "screen_media_browser_title") } /// Failed selecting media, please try again. internal static var screenMediaPickerErrorFailedSelection: String { return L10n.tr("Localizable", "screen_media_picker_error_failed_selection") } /// Captions might not be visible to people using older apps. @@ -2490,6 +2500,12 @@ internal enum L10n { internal static var testLanguageIdentifier: String { return L10n.tr("Localizable", "test_language_identifier") } /// en internal static var testUntranslatedDefaultLanguageIdentifier: String { return L10n.tr("Localizable", "test_untranslated_default_language_identifier") } + /// Historical messages are not available on this device + internal static var timelineDecryptionFailureHistoricalEventNoKeyBackup: String { return L10n.tr("Localizable", "timeline_decryption_failure_historical_event_no_key_backup") } + /// Unable to decrypt message + internal static var timelineDecryptionFailureUnableToDecrypt: String { return L10n.tr("Localizable", "timeline_decryption_failure_unable_to_decrypt") } + /// This message was blocked either because you did not verify your device or because the sender needs to verify your identity. + internal static var timelineDecryptionFailureWithheldUnverified: String { return L10n.tr("Localizable", "timeline_decryption_failure_withheld_unverified") } /// Troubleshoot internal static var troubleshootNotificationsEntryPointSection: String { return L10n.tr("Localizable", "troubleshoot_notifications_entry_point_section") } /// Troubleshoot notifications diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift index c26fc8d2b8..a101af8781 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift @@ -155,7 +155,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { errorLabel = L10n.commonUnableToDecryptNoAccess case .historicalMessage: encryptionType = .megolmV1AesSha2(sessionID: sessionID, cause: .historicalMessage) - errorLabel = L10n.commonUnableToDecryptNoAccess + errorLabel = L10n.timelineDecryptionFailureHistoricalEventNoKeyBackup } case .olmV1Curve25519AesSha2(let senderKey): encryptionType = .olmV1Curve25519AesSha2(senderKey: senderKey)