From 71e3925820d72277ce0806a20979fe828d2db0c4 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Thu, 21 Mar 2024 16:11:41 +1100 Subject: [PATCH] replace "Show Less" and disappearing messages outdated client banner --- Session/Conversations/ConversationVC.swift | 4 +++- .../Message Cells/Content Views/ReactionContainerView.swift | 2 +- Session/Meta/Translations/en.lproj/Localizable.strings | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index d63b40adf..40cab5c0e 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -204,7 +204,9 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers lazy var outdatedClientBanner: InfoBanner = { let info: InfoBanner.Info = InfoBanner.Info( - message: String(format: "DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER".localized(), self.viewModel.threadData.displayName), + message: "disappearingMessagesLegacy" + .put(key: "name", value: self.viewModel.threadData.displayName) + .localized(), backgroundColor: .primary, messageFont: .systemFont(ofSize: Values.verySmallFontSize), messageTintColor: .messageBubble_outgoingText, diff --git a/Session/Conversations/Message Cells/Content Views/ReactionContainerView.swift b/Session/Conversations/Message Cells/Content Views/ReactionContainerView.swift index f4141e3ee..ecca7355d 100644 --- a/Session/Conversations/Message Cells/Content Views/ReactionContainerView.swift +++ b/Session/Conversations/Message Cells/Content Views/ReactionContainerView.swift @@ -69,7 +69,7 @@ final class ReactionContainerView: UIView { textLabel.setContentCompressionResistancePriority(.required, for: .vertical) textLabel.setContentCompressionResistancePriority(.required, for: .horizontal) textLabel.font = .systemFont(ofSize: Values.verySmallFontSize) - textLabel.text = "EMOJI_REACTS_SHOW_LESS".localized() + textLabel.text = "showLess".localized() textLabel.themeTextColor = .textPrimary let result: UIView = UIView() diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index 2eb28b5e2..1c6c2cb42 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -614,6 +614,7 @@ "urlOpenBrowser" = "This will open in your browser."; "resolving" = "Resolving..."; "disappearingMessagesLegacy" = "{name} is using an outdated client. Disappearing messages may not work as expected."; +"showLess" = "Show Less"; // NOT IN THE LIST YET "APP_STARTUP_EXIT" = "Exit"; @@ -632,7 +633,6 @@ "GROUP_UPDATE_ERROR_TITLE" = "Couldn't Update Group"; "vc_conversation_voice_message_cancel_message" = "Slide to Cancel"; "MEDIA_GALLERY_MORE_ITEMS_FORMAT" = "+%@"; -"EMOJI_REACTS_SHOW_LESS" = "Show less"; "FOLLOW_SETTING_TITLE" = "Follow Setting"; "context_menu_resync" = "Resync"; "context_menu_ban_and_delete_all" = "Ban and Delete All";