From 4054796da14301adcb5df52ef22496ae55501fdf Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Mon, 18 Mar 2024 14:49:32 +1100 Subject: [PATCH] apply new localized string format --- .../Views & Modals/CallMissedTipsModal.swift | 8 ++- .../Conversations/ConversationSearch.swift | 9 +-- .../ConversationVC+Interaction.swift | 27 ++++---- Session/Conversations/ConversationVC.swift | 33 +++++----- .../Message Cells/InfoMessageCell.swift | 38 ++--------- .../Settings/ThreadSettingsViewModel.swift | 48 ++++++-------- .../ConversationTitleView.swift | 22 ++++--- .../GlobalSearch/EmptySearchResultCell.swift | 2 +- .../AllMediaViewController.swift | 6 +- .../DocumentTitleViewController.swift | 2 +- .../MediaPageViewController.swift | 8 ++- .../MediaTileViewController.swift | 2 +- Session/Meta/AppDelegate.swift | 7 +- .../Translations/en.lproj/Localizable.strings | 1 - Session/Notifications/AppNotifications.swift | 29 ++++---- .../PushRegistrationManager.swift | 4 +- .../UserNotificationsAdaptee.swift | 13 ++-- .../Settings/BlockedContactsViewModel.swift | 25 +++---- Session/Settings/NukeDataModal.swift | 9 ++- .../UIContextualAction+Utilities.swift | 66 +++++++------------ .../DisappearingMessageConfiguration.swift | 43 +++++++----- .../Database/Models/Interaction.swift | 8 ++- .../Control Messages/CallMessage.swift | 23 +++---- .../ClosedGroupControlMessage.swift | 34 ++++++---- .../Shared Models/MessageViewModel.swift | 1 + .../NSENotificationPresenter.swift | 29 ++++---- .../General/Localization.swift | 22 +++++-- .../General/String+Utilities.swift | 8 --- 28 files changed, 248 insertions(+), 279 deletions(-) diff --git a/Session/Calls/Views & Modals/CallMissedTipsModal.swift b/Session/Calls/Views & Modals/CallMissedTipsModal.swift index 5268f87ea..f4f717348 100644 --- a/Session/Calls/Views & Modals/CallMissedTipsModal.swift +++ b/Session/Calls/Views & Modals/CallMissedTipsModal.swift @@ -24,7 +24,9 @@ final class CallMissedTipsModal: Modal { private lazy var titleLabel: UILabel = { let result: UILabel = UILabel() result.font = .boldSystemFont(ofSize: Values.mediumFontSize) - result.text = "callsMissed".localized() + result.text = "callsMissed" + .put(key: "name", value: caller) + .localized() result.themeTextColor = .textPrimary result.textAlignment = .center @@ -34,11 +36,13 @@ final class CallMissedTipsModal: Modal { private lazy var messageLabel: UILabel = { let result: UILabel = UILabel() result.font = .systemFont(ofSize: Values.smallFontSize) - result.text = String(format: "callsYouMissedCallPermissions".localized(), caller) result.themeTextColor = .textPrimary result.textAlignment = .natural result.lineBreakMode = .byWordWrapping result.numberOfLines = 0 + result.attributedText = "callsYouMissedCallPermissions" + .put(key: "name", value: caller) + .localizedFormatted(in: result) return result }() diff --git a/Session/Conversations/ConversationSearch.swift b/Session/Conversations/ConversationSearch.swift index 83f9840ce..3ca0f9204 100644 --- a/Session/Conversations/ConversationSearch.swift +++ b/Session/Conversations/ConversationSearch.swift @@ -332,7 +332,7 @@ public final class SearchResultsBar: UIView { switch results.count { case 0: // Keyboard toolbar label when no messages match the search string - label.text = "searchMatchesNoneSpecific".localized() + label.text = "searchMatchesNone".localized() case 1: // Keyboard toolbar label when exactly 1 message matches the search string @@ -343,11 +343,12 @@ public final class SearchResultsBar: UIView { // // Embeds {{number/position of the 'currently viewed' result}} and // the {{total number of results}} - let format = "searchMatches".localized() - guard let currentIndex: Int = currentIndex else { return } - label.text = String(format: format, currentIndex + 1, results.count) + label.text = "searchMatches" + .put(key: "count", value: currentIndex + 1) + .put(key: "totalcount", value: results.count) + .localized() } if let currentIndex: Int = currentIndex { diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index 0c952712d..df5649a39 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -147,10 +147,9 @@ extension ConversationVC: self.viewModel.threadData.threadIsBlocked == true else { return false } - let message = String( - format: "blockUnblockDescription".localized(), - self.viewModel.threadData.displayName - ) + let message = "blockUnblockDescription" + .put(key: "name", value: self.viewModel.threadData.displayName) + .localized() let confirmationModal: ConfirmationModal = ConfirmationModal( info: ConfirmationModal.Info( title: String( @@ -900,7 +899,7 @@ extension ConversationVC: guard cellViewModel.variant != .infoDisappearingMessagesUpdate else { let messageDisappearingConfig = cellViewModel.messageDisappearingConfiguration() let expirationTimerString: String = floor(messageDisappearingConfig.durationSeconds).formatted(format: .long) - let expirationTypeString: String = (messageDisappearingConfig.type == .disappearAfterRead ? "read".localized().lowercased() : "disappearingMessagesSent".localized().lowercased()) + let expirationTypeString: String = (messageDisappearingConfig.type?.localizedName ?? "") let modalBodyString: String = ( messageDisappearingConfig.isEnabled ? String( @@ -955,16 +954,12 @@ extension ConversationVC: // If it's an incoming media message and the thread isn't trusted then show the placeholder view if cellViewModel.cellType != .textOnlyMessage && cellViewModel.variant == .standardIncoming && !cellViewModel.threadIsTrusted { - let message: String = String( - format: "attachmentsAutoDownloadModalDescription".localized(), - cellViewModel.authorName - ) + let message: String = "attachmentsAutoDownloadModalDescription" + .put(key: "conversationname", value: cellViewModel.authorName) + .localized() let confirmationModal: ConfirmationModal = ConfirmationModal( info: ConfirmationModal.Info( - title: String( - format: "attachmentsAutoDownloadModalTitle".localized(), - cellViewModel.authorName - ), + title: "attachmentsAutoDownloadModalTitle".localized(), body: .attributedText( NSAttributedString(string: message) .adding( @@ -1211,7 +1206,9 @@ extension ConversationVC: // URLs can be unsafe, so always ask the user whether they want to open one let actionSheet: UIAlertController = UIAlertController( title: "urlOpen".localized(), - message: String(format: "urlOpenDescription".localized(), url.absoluteString), + message: "urlOpenDescription" + .put(key: "url", value: url.absoluteString) + .localized(), preferredStyle: .actionSheet ) actionSheet.addAction(UIAlertAction(title: "open".localized(), style: .default) { [weak self] _ in @@ -2196,7 +2193,7 @@ extension ConversationVC: default: return (cellViewModel.threadId == userPublicKey ? "delete_message_for_me_and_my_devices".localized() : - String(format: "clearMessagesForEveryone".localized(), threadName) + "clearMessagesForEveryone".localized() ) } }(), diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index 6221538dc..113381921 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -738,21 +738,24 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers } private func emptyStateText(for threadData: SessionThreadViewModel) -> String { - return String( - format: { - switch (threadData.threadIsNoteToSelf, threadData.canWrite) { - case (true, _): return "noteToSelfEmpty".localized() - case (_, false): - return (threadData.profile?.blocksCommunityMessageRequests == true ? - "COMMUNITY_MESSAGE_REQUEST_DISABLED_EMPTY_STATE".localized() : - "conversationsEmpty".localized() - ) - - default: return "groupNoMessages".localized() - } - }(), - threadData.displayName - ) + switch (threadData.threadIsNoteToSelf, threadData.canWrite) { + case (true, _): + return "noteToSelfEmpty".localized() + case (_, false): + return (threadData.profile?.blocksCommunityMessageRequests == true ? + String( + format: "COMMUNITY_MESSAGE_REQUEST_DISABLED_EMPTY_STATE".localized(), + threadData.displayName + ) : + "conversationsEmpty" + .put(key: "conversationname", value: threadData.displayName) + .localized() + ) + default: + return "groupNoMessages" + .put(key: "groupname", value: threadData.displayName) + .localized() + } } private func handleThreadUpdates(_ updatedThreadData: SessionThreadViewModel, initialLoad: Bool = false) { diff --git a/Session/Conversations/Message Cells/InfoMessageCell.swift b/Session/Conversations/Message Cells/InfoMessageCell.swift index f026d59f6..8eb958c2d 100644 --- a/Session/Conversations/Message Cells/InfoMessageCell.swift +++ b/Session/Conversations/Message Cells/InfoMessageCell.swift @@ -120,39 +120,11 @@ final class InfoMessageCell: MessageCell { iconImageView.themeTintColor = .textSecondary } - if cellViewModel.variant == .infoDisappearingMessagesUpdate, let body: String = cellViewModel.body { - self.label.attributedText = NSAttributedString(string: body) - .adding( - attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ], - range: (body as NSString).range(of: cellViewModel.authorName) - ) - .adding( - attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ], - range: (body as NSString).range(of: "onionRoutingPathYou".localized()) - ) - .adding( - attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ], - range: (body as NSString).range(of: floor(cellViewModel.expiresInSeconds ?? 0).formatted(format: .long)) - ) - .adding( - attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ], - range: (body as NSString).range(of: "read".localized().lowercased()) - ) - .adding( - attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ], - range: (body as NSString).range(of: "disappearingMessagesSent".localized().lowercased()) - ) - .adding( - attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ], - range: (body as NSString).range(of: "off".localized().lowercased()) - ) - - if cellViewModel.canDoFollowingSetting() { - self.actionLabel.isHidden = false - self.actionLabel.text = "FOLLOW_SETTING_TITLE".localized() - } - } else { - self.label.text = cellViewModel.body + self.label.attributedText = cellViewModel.body?.formatted(in: self.label) + + if cellViewModel.canDoFollowingSetting() { + self.actionLabel.isHidden = false + self.actionLabel.text = "FOLLOW_SETTING_TITLE".localized() } self.label.themeTextColor = (cellViewModel.variant == .infoClosedGroupCurrentUserErrorLeaving) ? .danger : .textSecondary diff --git a/Session/Conversations/Settings/ThreadSettingsViewModel.swift b/Session/Conversations/Settings/ThreadSettingsViewModel.swift index 5694163c1..94146bb1b 100644 --- a/Session/Conversations/Settings/ThreadSettingsViewModel.swift +++ b/Session/Conversations/Settings/ThreadSettingsViewModel.swift @@ -381,7 +381,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi UIImage(named: "actionsheet_camera_roll_black")? .withRenderingMode(.alwaysTemplate) ), - title: MediaStrings.allMedia, + title: "conversationsSettingsAllMedia".localized(), accessibility: Accessibility( identifier: "\(ThreadSettingsViewModel.self).all_media", label: "All media" @@ -453,21 +453,16 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi return "off".localized() } guard Features.useNewDisappearingMessagesConfig else { - return String( - format: "disappearingMessagesDisappear".localized(), - "", - current.disappearingMessagesConfig.durationString - ) + return "disappearingMessagesDisappear" + .put(key: "disappearingmessagestype", value: "") + .put(key: "time", value: current.disappearingMessagesConfig.durationString) + .localized() } - return String( - format: "disappearingMessagesDisappear".localized(), - (current.disappearingMessagesConfig.type == .disappearAfterRead ? - "read".localized() : - "disappearingMessagesSent".localized() - ), - current.disappearingMessagesConfig.durationString - ) + return "disappearingMessagesDisappear" + .put(key: "disappearingmessagestype", value: (current.disappearingMessagesConfig.type?.localizedName ?? "")) + .put(key: "time", value: current.disappearingMessagesConfig.durationString) + .localized() }(), accessibility: Accessibility( identifier: "Disappearing messages", @@ -528,21 +523,14 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi title: "groupLeave".localized(), body: .attributedText({ if currentUserIsClosedGroupAdmin { - return NSAttributedString(string: "groupOnlyAdmin".localized()) + return "groupOnlyAdmin" + .put(key: "groupname", value: threadViewModel.displayName) + .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) } - let mutableAttributedString = NSMutableAttributedString( - string: String( - format: "communityLeaveDescription".localized(), - threadViewModel.displayName - ) - ) - mutableAttributedString.addAttribute( - .font, - value: UIFont.boldSystemFont(ofSize: Values.smallFontSize), - range: (mutableAttributedString.string as NSString).range(of: threadViewModel.displayName) - ) - return mutableAttributedString + return "communityLeaveDescription" + .put(key: "communityname", value: threadViewModel.displayName) + .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) }()), confirmTitle: "leave".localized(), confirmStyle: .danger, @@ -707,7 +695,11 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi ) }(), body: (threadViewModel.threadIsBlocked == true ? .none : - .text("blockDescription".localized()) + .text( + "blockDescription" + .put(key: "name", value: threadViewModel.displayName) + .localized() + ) ), confirmTitle: (threadViewModel.threadIsBlocked == true ? "blockUnblock".localized() : diff --git a/Session/Conversations/Views & Modals/ConversationTitleView.swift b/Session/Conversations/Views & Modals/ConversationTitleView.swift index 4fb0127fd..1748cd809 100644 --- a/Session/Conversations/Views & Modals/ConversationTitleView.swift +++ b/Session/Conversations/Views & Modals/ConversationTitleView.swift @@ -232,20 +232,22 @@ final class ConversationTitleView: UIView { guard Features.useNewDisappearingMessagesConfig else { return NSAttributedString(attachment: imageAttachment) .appending(string: " ") - .appending(string: String( - format: "disappearingMessagesDisappear".localized(), - "", - floor(config.durationSeconds).formatted(format: .short) - )) + .appending( + string: "disappearingMessagesDisappear" + .put(key: "disappearingmessagestype", value: "") + .put(key: "time", value: floor(config.durationSeconds).formatted(format: .short)) + .localized() + ) } return NSAttributedString(attachment: imageAttachment) .appending(string: " ") - .appending(string: String( - format: "disappearingMessagesDisappear".localized(), - (config.type == .disappearAfterRead ? "read".localized() : "disappearingMessagesSent".localized()), - floor(config.durationSeconds).formatted(format: .short) - )) + .appending( + string: "disappearingMessagesDisappear" + .put(key: "disappearingmessagestype", value: (config.type?.localizedName ?? "")) + .put(key: "time", value: floor(config.durationSeconds).formatted(format: .short)) + .localized() + ) }() labelInfos.append( diff --git a/Session/Home/GlobalSearch/EmptySearchResultCell.swift b/Session/Home/GlobalSearch/EmptySearchResultCell.swift index 97cec742b..f2bddf539 100644 --- a/Session/Home/GlobalSearch/EmptySearchResultCell.swift +++ b/Session/Home/GlobalSearch/EmptySearchResultCell.swift @@ -10,7 +10,7 @@ import SignalCoreKit class EmptySearchResultCell: UITableViewCell { private lazy var messageLabel: UILabel = { let result = UILabel() - result.text = "searchMatchesNoneSpecific".localized() + result.text = "searchMatchesNone".localized() result.themeTextColor = .textPrimary result.textAlignment = .center result.numberOfLines = 3 diff --git a/Session/Media Viewing & Editing/AllMediaViewController.swift b/Session/Media Viewing & Editing/AllMediaViewController.swift index 3eff09cb5..417eb359b 100644 --- a/Session/Media Viewing & Editing/AllMediaViewController.swift +++ b/Session/Media Viewing & Editing/AllMediaViewController.swift @@ -18,12 +18,12 @@ public class AllMediaViewController: UIViewController, UIPageViewControllerDataS private lazy var tabBar: TabBar = { let result: TabBar = TabBar( tabs: [ - TabBar.Tab(title: MediaStrings.media) { [weak self] in + TabBar.Tab(title: "media".localized()) { [weak self] in guard let self = self else { return } self.pageVC.setViewControllers([ self.pages[0] ], direction: .forward, animated: false, completion: nil) self.updateSelectButton(updatedData: self.mediaTitleViewController.viewModel.galleryData, inBatchSelectMode: self.mediaTitleViewController.isInBatchSelectMode) }, - TabBar.Tab(title: MediaStrings.document) { [weak self] in + TabBar.Tab(title: "DOCUMENT_TAB_TITLE".localized()) { [weak self] in guard let self = self else { return } self.pageVC.setViewControllers([ self.pages[1] ], direction: .forward, animated: false, completion: nil) self.endSelectMode() @@ -70,7 +70,7 @@ public class AllMediaViewController: UIViewController, UIPageViewControllerDataS ViewControllerUtilities.setUpDefaultSessionStyle( for: self, - title: MediaStrings.allMedia, + title: "conversationsSettingsAllMedia".localized(), hasCustomBackButton: false ) diff --git a/Session/Media Viewing & Editing/DocumentTitleViewController.swift b/Session/Media Viewing & Editing/DocumentTitleViewController.swift index dc8b73d85..dbb6226af 100644 --- a/Session/Media Viewing & Editing/DocumentTitleViewController.swift +++ b/Session/Media Viewing & Editing/DocumentTitleViewController.swift @@ -85,7 +85,7 @@ public class DocumentTileViewController: UIViewController, UITableViewDelegate, ViewControllerUtilities.setUpDefaultSessionStyle( for: self, - title: MediaStrings.document, + title:"DOCUMENT_TAB_TITLE".localized(), hasCustomBackButton: false ) diff --git a/Session/Media Viewing & Editing/MediaPageViewController.swift b/Session/Media Viewing & Editing/MediaPageViewController.swift index 96e9c8f2d..6d61b069e 100644 --- a/Session/Media Viewing & Editing/MediaPageViewController.swift +++ b/Session/Media Viewing & Editing/MediaPageViewController.swift @@ -137,7 +137,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou self.navigationItem.titleView = portraitHeaderView if showAllMediaButton { - self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: MediaStrings.allMedia, style: .plain, target: self, action: #selector(didPressAllMediaButton)) + self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "conversationsSettingsAllMedia".localized(), style: .plain, target: self, action: #selector(didPressAllMediaButton)) } // Even though bars are opaque, we want content to be layed out behind them. @@ -903,8 +903,10 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou let formattedDate = dateFormatter.string(from: date) portraitHeaderDateLabel.text = formattedDate - let landscapeHeaderFormat = "attachmentsMedia".localized() - let landscapeHeaderText = String(format: landscapeHeaderFormat, name, formattedDate) + let landscapeHeaderText = "attachmentsMedia" + .put(key: "name", value: name) + .put(key: "datetime", value: formattedDate) + .localized() self.title = landscapeHeaderText self.navigationItem.title = landscapeHeaderText } diff --git a/Session/Media Viewing & Editing/MediaTileViewController.swift b/Session/Media Viewing & Editing/MediaTileViewController.swift index 56a23a38f..994f8d9f4 100644 --- a/Session/Media Viewing & Editing/MediaTileViewController.swift +++ b/Session/Media Viewing & Editing/MediaTileViewController.swift @@ -133,7 +133,7 @@ public class MediaTileViewController: UIViewController, UICollectionViewDataSour ViewControllerUtilities.setUpDefaultSessionStyle( for: self, - title: MediaStrings.allMedia, + title: "conversationsSettingsAllMedia".localized(), hasCustomBackButton: false ) diff --git a/Session/Meta/AppDelegate.swift b/Session/Meta/AppDelegate.swift index a2f177b86..0da572d4e 100644 --- a/Session/Meta/AppDelegate.swift +++ b/Session/Meta/AppDelegate.swift @@ -488,10 +488,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD Logger.info("Exiting because we are in the background and the database password is not accessible.") let notificationContent: UNMutableNotificationContent = UNMutableNotificationContent() - notificationContent.body = String( - format: "notificationsIosRestart".localized(), - UIDevice.current.localizedModel - ) + notificationContent.body = "notificationsIosRestart" + .put(key: "device", value: UIDevice.current.localizedModel) + .localized() let notificationRequest: UNNotificationRequest = UNNotificationRequest( identifier: UUID().uuidString, content: notificationContent, diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index bbafba4f7..dca71af2a 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -686,7 +686,6 @@ "ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_JPEG" = "Unable to convert image."; "ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_MP4" = "Unable to process video."; "ATTACHMENT_ERROR_COULD_NOT_RESIZE_IMAGE" = "Unable to resize image."; -"GROUP_TITLE_CHANGED" = "Title is now '%@'. "; "GROUP_CREATED" = "Group created"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages. Messages they send will no longer disappear."; "DISAPPERING_MESSAGES_INFO_ENABLE" = "%@ has set messages to disappear %@ after they have been %@"; diff --git a/Session/Notifications/AppNotifications.swift b/Session/Notifications/AppNotifications.swift index fb4bce871..d0aa5ec10 100644 --- a/Session/Notifications/AppNotifications.swift +++ b/Session/Notifications/AppNotifications.swift @@ -145,16 +145,15 @@ public class NotificationPresenter: NotificationsProtocol { notificationTitle = (isMessageRequest ? "sessionMessenger".localized() : senderName) case .legacyGroup, .group, .community: - notificationTitle = String( - format: NotificationStrings.incomingGroupMessageTitleFormat, - senderName, - groupName - ) + notificationTitle = "notificationsIosGroup" + .put(key: "name", value: senderName) + .put(key: "conversationname", value: groupName) + .localized() } } switch previewType { - case .noNameNoPreview, .nameNoPreview: notificationBody = NotificationStrings.incomingMessageBody + case .noNameNoPreview, .nameNoPreview: notificationBody = "messageNewYouveGotA".localized() case .nameAndPreview: notificationBody = messageText } @@ -261,15 +260,13 @@ public class NotificationPresenter: NotificationsProtocol { let notificationBody: String? = { switch messageInfo.state { case .permissionDenied: - return String( - format: "callsYouMissedCallPermissions".localized(), - senderName - ) + return "callsYouMissedCallPermissions" + .put(key: "name", value: senderName) + .localized() case .missed: - return String( - format: "callsMissedCallFrom".localized(), - senderName - ) + return "callsMissedCallFrom" + .put(key: "name", value: senderName) + .localized() default: return nil } @@ -324,7 +321,7 @@ public class NotificationPresenter: NotificationsProtocol { switch previewType { case .nameAndPreview: break - default: notificationBody = NotificationStrings.incomingMessageBody + default: notificationBody = "messageNewYouveGotA".localized() } let category = AppNotificationCategory.incomingMessage @@ -390,7 +387,7 @@ public class NotificationPresenter: NotificationsProtocol { case .nameNoPreview, .nameAndPreview: notificationTitle = threadName } - let notificationBody = NotificationStrings.failedToSendBody + let notificationBody = "messageErrorDelivery".localized() let userInfo: [AnyHashable: Any] = [ AppNotificationUserInfoKey.threadId: thread.id, diff --git a/Session/Notifications/PushRegistrationManager.swift b/Session/Notifications/PushRegistrationManager.swift index 2e3daccc2..439fe2f75 100644 --- a/Session/Notifications/PushRegistrationManager.swift +++ b/Session/Notifications/PushRegistrationManager.swift @@ -300,7 +300,9 @@ public enum PushRegistrationError: Error { if let messageInfoData: Data = try? JSONEncoder().encode(messageInfo) { return String(data: messageInfoData, encoding: .utf8) } else { - return "Incoming call." // TODO: We can do better here. + return "callsIncoming" + .put(key: "name", value: caller) + .localized() } }() diff --git a/Session/Notifications/UserNotificationsAdaptee.swift b/Session/Notifications/UserNotificationsAdaptee.swift index dfcc60027..ad1b5c933 100644 --- a/Session/Notifications/UserNotificationsAdaptee.swift +++ b/Session/Notifications/UserNotificationsAdaptee.swift @@ -33,16 +33,16 @@ class UserNotificationConfig { case .markAsRead: return UNNotificationAction( identifier: action.identifier, - title: MessageStrings.markAsReadNotificationAction, + title: "messageMarkRead".localized(), options: [] ) case .reply: return UNTextInputNotificationAction( identifier: action.identifier, - title: MessageStrings.replyNotificationAction, + title: "reply".localized(), options: [], - textInputButtonTitle: MessageStrings.sendButton, + textInputButtonTitle: "send".localized(), textInputPlaceholder: "" ) } @@ -153,10 +153,9 @@ extension UserNotificationPresenterAdaptee: NotificationPresenterAdaptee { content.title : threadName ) - content.body = String( - format: NotificationStrings.incomingCollapsedMessagesBody, - "\(numberOfNotifications)" - ) + content.body = "messageNewYouveGotMany" + .put(key: "count", value: numberOfNotifications) + .localized() } content.userInfo[AppNotificationUserInfoKey.threadNotificationCounter] = numberOfNotifications diff --git a/Session/Settings/BlockedContactsViewModel.swift b/Session/Settings/BlockedContactsViewModel.swift index 253123a73..af08889dd 100644 --- a/Session/Settings/BlockedContactsViewModel.swift +++ b/Session/Settings/BlockedContactsViewModel.swift @@ -181,13 +181,10 @@ public class BlockedContactsViewModel: SessionTableViewModel, NavigatableStateHo let confirmationTitle: String = { guard contactNames.count > 1 else { // Show a single users name - return String( - format: "blockUnblockDescription".localized(), - ( - contactNames.first ?? - "CONVERSATION_SETTINGS_BLOCKED_CONTACTS_UNBLOCK_CONFIRMATION_TITLE_FALLBACK".localized() - ) - ) + let name: String = contactNames.first ?? "CONVERSATION_SETTINGS_BLOCKED_CONTACTS_UNBLOCK_CONFIRMATION_TITLE_FALLBACK".localized() + return "blockUnblockDescription" + .put(key: "name", value: name) + .localized() } guard contactNames.count > 3 else { // Show up to three users names @@ -195,10 +192,9 @@ public class BlockedContactsViewModel: SessionTableViewModel, NavigatableStateHo let lastName: String = contactNames[contactNames.count - 1] return [ - String( - format: "blockUnblockDescription".localized(), - initialNames.joined(separator: ", ") - ), + "blockUnblockDescription" + .put(key: "name", value: initialNames.joined(separator: ", ")) + .localized(), String( format: "CONVERSATION_SETTINGS_BLOCKED_CONTACTS_UNBLOCK_CONFIRMATION_TITLE_MULTIPLE_2_SINGLE".localized(), lastName @@ -214,10 +210,9 @@ public class BlockedContactsViewModel: SessionTableViewModel, NavigatableStateHo let initialNames: [String] = Array(contactNames.prefix(upTo: numNamesToShow)) return [ - String( - format: "blockUnblockDescription".localized(), - initialNames.joined(separator: ", ") - ), + "blockUnblockDescription" + .put(key: "name", value: initialNames.joined(separator: ", ")) + .localized(), String( format: "CONVERSATION_SETTINGS_BLOCKED_CONTACTS_UNBLOCK_CONFIRMATION_TITLE_MULTIPLE_3".localized(), (contactNames.count - numNamesToShow) diff --git a/Session/Settings/NukeDataModal.swift b/Session/Settings/NukeDataModal.swift index 76e29213b..cb6e69276 100644 --- a/Session/Settings/NukeDataModal.swift +++ b/Session/Settings/NukeDataModal.swift @@ -228,10 +228,15 @@ final class NukeDataModal: Modal { let message: String if potentiallyMaliciousSnodes.count == 1 { - message = String(format: "clearDataErrorDescription1".localized(), potentiallyMaliciousSnodes[0]) + message = "clearDataErrorDescription1" + .put(key: "servicenodeid", value: potentiallyMaliciousSnodes[0]) + .localized() } else { - message = String(format: "clearDataErrorDescription2".localized(), String(potentiallyMaliciousSnodes.count), potentiallyMaliciousSnodes.joined(separator: ", ")) + message = "clearDataErrorDescription2" + .put(key: "count", value: potentiallyMaliciousSnodes.count) + .put(key: "servicenodeid", value: potentiallyMaliciousSnodes.joined(separator: ", ")) + .localized() } let modal: ConfirmationModal = ConfirmationModal( diff --git a/Session/Utilities/UIContextualAction+Utilities.swift b/Session/Utilities/UIContextualAction+Utilities.swift index 8dcc8c262..778277a2c 100644 --- a/Session/Utilities/UIContextualAction+Utilities.swift +++ b/Session/Utilities/UIContextualAction+Utilities.swift @@ -383,21 +383,14 @@ public extension UIContextualAction { let confirmationModalExplanation: NSAttributedString = { if threadViewModel.currentUserIsClosedGroupAdmin == true { - return NSAttributedString(string: "groupOnlyAdmin".localized()) + return "groupOnlyAdmin" + .put(key: "groupname", value: threadViewModel.displayName) + .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) } - let mutableAttributedString = NSMutableAttributedString( - string: String( - format: "communityLeaveDescription".localized(), - threadViewModel.displayName - ) - ) - mutableAttributedString.addAttribute( - .font, - value: UIFont.boldSystemFont(ofSize: Values.smallFontSize), - range: (mutableAttributedString.string as NSString).range(of: threadViewModel.displayName) - ) - return mutableAttributedString + return "communityLeaveDescription" + .put(key: "communityname", value: threadViewModel.displayName) + .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) }() let confirmationModal: ConfirmationModal = ConfirmationModal( @@ -466,36 +459,27 @@ public extension UIContextualAction { ) } guard threadViewModel.currentUserIsClosedGroupAdmin == false else { - return NSAttributedString( - string: "groupOnlyAdmin".localized() - ) + return "groupOnlyAdmin" + .put(key: "groupname", value: threadViewModel.displayName) + .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) } - let message = String( - format: { - switch threadViewModel.threadVariant { - case .contact: - return - "conversationsDeleteDescription".localized() - - case .legacyGroup, .group: - return - "groupDeleteDescription".localized() - - case .community: - return "communityLeaveDescription".localized() - } - }(), - threadViewModel.displayName - ) - - return NSAttributedString(string: message) - .adding( - attributes: [ - .font: UIFont.boldSystemFont(ofSize: Values.smallFontSize) - ], - range: (message as NSString).range(of: threadViewModel.displayName) - ) + switch threadViewModel.threadVariant { + case .contact: + return "conversationsDeleteDescription" + .put(key: "name", value: threadViewModel.displayName) + .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) + + case .legacyGroup, .group: + return "groupDeleteDescription" + .put(key: "groupname", value: threadViewModel.displayName) + .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) + + case .community: + return "communityLeaveDescription" + .put(key: "communityname", value: threadViewModel.displayName) + .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) + } }() let confirmationModal: ConfirmationModal = ConfirmationModal( diff --git a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift index 27a0147aa..af0626807 100644 --- a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift +++ b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift @@ -40,6 +40,17 @@ public struct DisappearingMessagesConfiguration: Codable, Identifiable, Equatabl case unknown case disappearAfterRead case disappearAfterSend + + public var localizedName: String { + switch self { + case .unknown: + return "" + case .disappearAfterRead: + return "read".localized().lowercased() + case .disappearAfterSend: + return "disappearingMessagesSent".localized().lowercased() + } + } init(protoType: SNProtoContent.SNProtoContentExpirationType) { switch protoType { @@ -140,23 +151,21 @@ public extension DisappearingMessagesConfiguration { return "disappearingMessagesTurnedOffYou".localized() } - return String( - format: "disappearingMessagesSetYou".localized(), - floor(durationSeconds).formatted(format: .long), - (type == .disappearAfterRead ? "read".localized().lowercased() : "disappearingMessagesSent".localized().lowercased()) - ) + return "disappearingMessagesSetYou" + .put(key: "time", value: floor(durationSeconds).formatted(format: .long)) + .put(key: "disappearingmessagestype", value: (type?.localizedName ?? "")) + .localized() } guard isEnabled, durationSeconds > 0 else { return String(format: "DISAPPERING_MESSAGES_INFO_DISABLE".localized(), senderName) } - return String( - format: "disappearingMessagesSet".localized(), - senderName, - floor(durationSeconds).formatted(format: .long), - (type == .disappearAfterRead ? "read".localized().lowercased() : "disappearingMessagesSent".localized().lowercased()) - ) + return "disappearingMessagesSet" + .put(key: "name", value: senderName) + .put(key: "time", value: floor(durationSeconds).formatted(format: .long)) + .put(key: "disappearingmessagestype", value: (type?.localizedName ?? "")) + .localized() } // TODO: Remove me @@ -165,14 +174,16 @@ public extension DisappearingMessagesConfiguration { // Changed by this device or via synced transcript guard isEnabled, durationSeconds > 0 else { return "disappearingMessagesTurnedOffYou".localized() } - return String( - format: "disappearingMessagesSetYou".localized(), - floor(durationSeconds).formatted(format: .long) - ) + return "disappearingMessagesSetYou" + .put(key: "time", value: floor(durationSeconds).formatted(format: .long)) + .put(key: "disappearingmessagestype", value: (type?.localizedName ?? "")) + .localized() } guard isEnabled, durationSeconds > 0 else { - return String(format: "disappearingMessagesTurnedOff".localized(), senderName) + return "disappearingMessagesTurnedOff" + .put(key: "name", value: senderName) + .localized() } return String( diff --git a/SessionMessagingKit/Database/Models/Interaction.swift b/SessionMessagingKit/Database/Models/Interaction.swift index a492b86f7..e863e8f56 100644 --- a/SessionMessagingKit/Database/Models/Interaction.swift +++ b/SessionMessagingKit/Database/Models/Interaction.swift @@ -1026,10 +1026,14 @@ public extension Interaction { case .infoMediaSavedNotification: // TODO: Use referencedAttachmentTimestamp to tell the user * which * media was saved - return String(format: "attachmentsMediaSaved".localized(), authorDisplayName) + return "attachmentsMediaSaved" + .put(key: "name", value: authorDisplayName) + .localized() case .infoScreenshotNotification: - return String(format: "screenshotTaken".localized(), authorDisplayName) + return "screenshotTaken" + .put(key: "name", value: authorDisplayName) + .localized() case .infoClosedGroupCreated: return "GROUP_CREATED".localized() case .infoClosedGroupCurrentUserLeft: return "groupMemberYouLeft".localized() diff --git a/SessionMessagingKit/Messages/Control Messages/CallMessage.swift b/SessionMessagingKit/Messages/Control Messages/CallMessage.swift index 2891e3a18..794034936 100644 --- a/SessionMessagingKit/Messages/Control Messages/CallMessage.swift +++ b/SessionMessagingKit/Messages/Control Messages/CallMessage.swift @@ -242,22 +242,19 @@ public extension CallMessage { func previewText(threadContactDisplayName: String) -> String { switch state { case .incoming: - return String( - format: "callsCalledYou".localized(), - threadContactDisplayName - ) - + return "callsCalledYou" + .put(key: "name", value: threadContactDisplayName) + .localized() + case .outgoing: - return String( - format: "callsYouCalled".localized(), - threadContactDisplayName - ) + return "callsYouCalled" + .put(key: "name", value: threadContactDisplayName) + .localized() case .missed, .permissionDenied: - return String( - format: "callsMissedCallFrom".localized(), - threadContactDisplayName - ) + return "callsMissedCallFrom" + .put(key: "name", value: threadContactDisplayName) + .localized() // TODO: We should do better here case .unknown: return "" diff --git a/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift b/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift index c6800c83c..cf164b249 100644 --- a/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift +++ b/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift @@ -364,7 +364,9 @@ public extension ClosedGroupControlMessage.Kind { func infoMessage(_ db: Database, sender: String) throws -> String? { switch self { case .nameChange(let name): - return String(format: "GROUP_TITLE_CHANGED".localized(), name) + return "groupNameNew" + .put(key: "groupname", value: name) + .localized() case .membersAdded(let membersAsData): let memberIds: [String] = membersAsData.map { $0.toHexString() } @@ -377,10 +379,9 @@ public extension ClosedGroupControlMessage.Kind { Profile.truncated(id: $0, threadVariant: .legacyGroup) } - return String( - format: "groupMemberNew".localized(), - addedMemberNames.joined(separator: ", ") - ) + return "groupMemberNew" + .put(key: "name", value: addedMemberNames.joined(separator: ", ")) + .localized() case .membersRemoved(let membersAsData): let userPublicKey: String = getUserHexEncodedPublicKey(db) @@ -399,18 +400,21 @@ public extension ClosedGroupControlMessage.Kind { knownMemberNameMap[$0] ?? Profile.truncated(id: $0, threadVariant: .legacyGroup) } - let format: String = (removedMemberNames.count > 1 ? - "groupRemovedMore".localized() : - "groupRemoved".localized() - ) - + // TODO: Need logic change infoMessage = infoMessage.appending( - String(format: format, removedMemberNames.joined(separator: ", ")) + "groupRemoved" + .put(key: "name", value: removedMemberNames.joined(separator: ", ")) + .localized() ) } - + // TODO: Need logic change if memberIds.contains(userPublicKey) { - infoMessage = infoMessage.appending("groupRemovedYou".localized()) + infoMessage = infoMessage + .appending( + "groupRemovedYou" + .put(key: "groupname", value: "") + .localized() + ) } return infoMessage @@ -421,7 +425,9 @@ public extension ClosedGroupControlMessage.Kind { guard sender != userPublicKey else { return "groupMemberYouLeft".localized() } if let displayName: String = Profile.displayNameNoFallback(db, id: sender) { - return String(format: "groupMemberLeft".localized(), displayName) + return "groupMemberLeft" + .put(key: "name", value: displayName) + .localized() } return "groupUpdated".localized() diff --git a/SessionMessagingKit/Shared Models/MessageViewModel.swift b/SessionMessagingKit/Shared Models/MessageViewModel.swift index 3815a73fb..5b142ce34 100644 --- a/SessionMessagingKit/Shared Models/MessageViewModel.swift +++ b/SessionMessagingKit/Shared Models/MessageViewModel.swift @@ -514,6 +514,7 @@ public extension MessageViewModel { } func canDoFollowingSetting() -> Bool { + guard self.variant == .infoDisappearingMessagesUpdate else { return false } guard self.authorId != self.currentUserPublicKey else { return false } guard self.threadVariant == .contact else { return false } return self.messageDisappearingConfiguration() != self.threadDisappearingConfiguration() diff --git a/SessionNotificationServiceExtension/NSENotificationPresenter.swift b/SessionNotificationServiceExtension/NSENotificationPresenter.swift index 47465a264..2d354525a 100644 --- a/SessionNotificationServiceExtension/NSENotificationPresenter.swift +++ b/SessionNotificationServiceExtension/NSENotificationPresenter.swift @@ -33,11 +33,10 @@ public class NSENotificationPresenter: NSObject, NotificationsProtocol { return } - notificationTitle = String( - format: NotificationStrings.incomingGroupMessageTitleFormat, - senderName, - groupName - ) + notificationTitle = "notificationsIosGroup" + .put(key: "name", value: senderName) + .put(key: "conversationname", value: groupName) + .localized() } let snippet: String = (interaction.previewText(db) @@ -71,11 +70,11 @@ public class NSENotificationPresenter: NSObject, NotificationsProtocol { case .nameNoPreview: notificationContent.title = notificationTitle - notificationContent.body = NotificationStrings.incomingMessageBody + notificationContent.body = "messageNewYouveGotA".localized() case .noNameNoPreview: notificationContent.title = "sessionMessenger".localized() - notificationContent.body = NotificationStrings.incomingMessageBody + notificationContent.body = "messageNewYouveGotA".localized() } // If it's a message request then overwrite the body to be something generic (only show a notification @@ -110,10 +109,9 @@ public class NSENotificationPresenter: NSObject, NotificationsProtocol { notificationContent.title : groupName ) - notificationContent.body = String( - format: NotificationStrings.incomingCollapsedMessagesBody, - "\(numberOfNotifications)" - ) + notificationContent.body = "messageNewYouveGotMany" + .put(key: "count", value: numberOfNotifications) + .localized() } notificationContent.userInfo[NotificationServiceExtension.threadNotificationCounter] = numberOfNotifications @@ -167,10 +165,9 @@ public class NSENotificationPresenter: NSObject, NotificationsProtocol { let senderName: String = Profile.displayName(db, id: interaction.authorId, threadVariant: thread.variant) if messageInfo.state == .permissionDenied { - notificationContent.body = String( - format: "callsYouMissedCallPermissions".localized(), - senderName - ) + notificationContent.body = "callsYouMissedCallPermissions" + .put(key: "name", value: senderName) + .localizedDeformatted() } addNotifcationRequest( @@ -202,7 +199,7 @@ public class NSENotificationPresenter: NSObject, NotificationsProtocol { switch previewType { case .nameAndPreview: break - default: notificationBody = NotificationStrings.incomingMessageBody + default: notificationBody = "messageNewYouveGotA".localized() } let userInfo: [String: Any] = [ diff --git a/SessionUtilitiesKit/General/Localization.swift b/SessionUtilitiesKit/General/Localization.swift index 23c7e09c2..549d6c8f2 100644 --- a/SessionUtilitiesKit/General/Localization.swift +++ b/SessionUtilitiesKit/General/Localization.swift @@ -207,6 +207,14 @@ final public class LocalizationHelper: CustomStringConvertible { public func localizedFormatted(in view: FontAccessible) -> NSAttributedString { return localizedFormatted(baseFont: (view.fontValue ?? .systemFont(ofSize: 14))) } + + public func localizedFormatted(baseFont: UIFont) -> NSAttributedString { + return NSAttributedString(stringWithHTMLTags: localized(), font: baseFont) + } + + public func localizedDeformatted() -> String { + return NSAttributedString(stringWithHTMLTags: localized(), font: .systemFont(ofSize: 14)).string + } // MARK: - Internal functions @@ -214,10 +222,6 @@ final public class LocalizationHelper: CustomStringConvertible { return "{" + key + "}" } - private func localizedFormatted(baseFont: UIFont) -> NSAttributedString { - return NSAttributedString(stringWithHTMLTags: localized(), font: baseFont) - } - // MARK: - CustomStringConvertible public var description: String { @@ -252,11 +256,15 @@ public extension String { return LocalizationHelper(template: self).put(key: key, value: value) } -// func localized() -> String { -// return LocalizationHelper(template: self).localized() -// } + func localized() -> String { + return LocalizationHelper(template: self).localized() + } func localizedFormatted(in view: FontAccessible) -> NSAttributedString { return LocalizationHelper(template: self).localizedFormatted(in: view) } + + func formatted(in view: FontAccessible) -> NSAttributedString { + return NSAttributedString(stringWithHTMLTags: self, font: (view.fontValue ?? .systemFont(ofSize: 14))) + } } diff --git a/SessionUtilitiesKit/General/String+Utilities.swift b/SessionUtilitiesKit/General/String+Utilities.swift index dc41145eb..bde048169 100644 --- a/SessionUtilitiesKit/General/String+Utilities.swift +++ b/SessionUtilitiesKit/General/String+Utilities.swift @@ -37,14 +37,6 @@ public extension String { ) } - func localized() -> String { - // If the localized string matches the key provided then the localisation failed - let localizedString = NSLocalizedString(self, comment: "") - owsAssertDebug(localizedString != self, "Key \"\(self)\" is not set in Localizable.strings") - - return localizedString - } - func ranges(of substring: String, options: CompareOptions = [], locale: Locale? = nil) -> [Range] { var ranges: [Range] = []