From 339fd937a763f069bc926500d2cb73b44f03bd8f Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 12 Dec 2022 16:35:32 -0700 Subject: [PATCH] Change the Catch Up command menu option to something that flows a little better. --- .../Sidebar/SidebarViewController+ContextualMenus.swift | 8 ++++---- iOS/MasterFeed/MasterFeedViewController.swift | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift b/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift index c6280d660..67e6dc90e 100644 --- a/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift +++ b/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift @@ -270,7 +270,7 @@ private extension SidebarViewController { if webFeed.unreadCount > 0 { menu.addItem(markAllReadMenuItem([webFeed])) - let catchUpMenuItem = NSMenuItem(title: NSLocalizedString("Mark Older Than as Read...", comment: "Command Submenu"), action: nil, keyEquivalent: "") + let catchUpMenuItem = NSMenuItem(title: NSLocalizedString("Mark as Read Older Than", comment: "Command Submenu"), action: nil, keyEquivalent: "") let catchUpSubMenu = catchUpSubMenu([webFeed]) menu.addItem(catchUpMenuItem) @@ -332,7 +332,7 @@ private extension SidebarViewController { if folder.unreadCount > 0 { menu.addItem(markAllReadMenuItem([folder])) - let catchUpMenuItem = NSMenuItem(title: NSLocalizedString("Mark Older Than as Read...", comment: "Command Submenu"), action: nil, keyEquivalent: "") + let catchUpMenuItem = NSMenuItem(title: NSLocalizedString("Mark as Read Older Than", comment: "Command Submenu"), action: nil, keyEquivalent: "") let catchUpSubMenu = catchUpSubMenu([folder]) menu.addItem(catchUpMenuItem) @@ -360,7 +360,7 @@ private extension SidebarViewController { } } - let catchUpMenuItem = NSMenuItem(title: NSLocalizedString("Mark Older Than as Read...", comment: "Command Submenu"), action: nil, keyEquivalent: "") + let catchUpMenuItem = NSMenuItem(title: NSLocalizedString("Mark as Read Older Than", comment: "Command Submenu"), action: nil, keyEquivalent: "") let catchUpSubMenu = catchUpSubMenu([smartFeed]) menu.addItem(catchUpMenuItem) menu.setSubmenu(catchUpSubMenu, for: catchUpMenuItem) @@ -374,7 +374,7 @@ private extension SidebarViewController { if anyObjectInArrayHasNonZeroUnreadCount(objects) { menu.addItem(markAllReadMenuItem(objects)) - let catchUpMenuItem = NSMenuItem(title: NSLocalizedString("Mark Older Than as Read...", comment: "Command Submenu"), action: nil, keyEquivalent: "") + let catchUpMenuItem = NSMenuItem(title: NSLocalizedString("Mark as Read Older Than", comment: "Command Submenu"), action: nil, keyEquivalent: "") let catchUpSubMenu = catchUpSubMenu(objects) menu.addItem(catchUpMenuItem) diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 4acd19458..b9f469fca 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -1186,7 +1186,7 @@ private extension MasterFeedViewController { } } - let title = NSLocalizedString("Mark Older Than as Read...", comment: "Command") + let title = NSLocalizedString("Mark as Read Older Than", comment: "Command") let oneDayAction = UIAction(title: "1 Day") { [weak self] action in MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: "Mark Older Than 1 Day as Read", sourceType: contentView) { [weak self] in let cutoff = Calendar.current.date(byAdding: .day, value: -1, to: Date()) @@ -1288,7 +1288,7 @@ private extension MasterFeedViewController { return nil } - let title = NSLocalizedString("Mark Older Than as Read...", comment: "Command") + let title = NSLocalizedString("Mark as Read Older Than", comment: "Command") let oneDayAction = UIAction(title: "1 Day") { [weak self] action in MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: "Mark Older Than 1 Day as Read", sourceType: contentView) { [weak self] in // If you don't have this delay the screen flashes when it executes this code