From 02e19366fb280a3bc61a9646a884fd1fff78ea7e Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 14 Nov 2022 20:18:09 -0600 Subject: [PATCH] Removed the entity names from the Mark All items to match the Mac app --- iOS/MasterFeed/MasterFeedViewController.swift | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 459033260..43f949678 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -1059,8 +1059,7 @@ private extension MasterFeedViewController { return nil } - let localizedMenuText = NSLocalizedString("Mark All as Read in “%@”", comment: "Command") - let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, webFeed.nameForDisplay) as String + let title = NSLocalizedString("Mark All as Read", comment: "Command") let cancel = { completion(true) } @@ -1140,8 +1139,7 @@ private extension MasterFeedViewController { return nil } - let localizedMenuText = NSLocalizedString("Mark All as Read in “%@”", comment: "Command") - let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, feed.nameForDisplay) as String + let title = NSLocalizedString("Mark All as Read", comment: "Command") let action = UIAction(title: title, image: AppAssets.markAllAsReadImage) { [weak self] action in MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in if let articles = try? feed.fetchUnreadArticles() { @@ -1158,8 +1156,7 @@ private extension MasterFeedViewController { return nil } - let localizedMenuText = NSLocalizedString("Mark All as Read in “%@”", comment: "Command") - let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, account.nameForDisplay) as String + let title = NSLocalizedString("Mark All as Read", comment: "Command") let action = UIAction(title: title, image: AppAssets.markAllAsReadImage) { [weak self] action in MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in // If you don't have this delay the screen flashes when it executes this code