From 46743a0f4950eeae2faeef5f841fbe42a35b9ff1 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 28 Sep 2020 20:28:53 -0500 Subject: [PATCH] Simplified the delete titles. --- Mac/MainWindow/Sidebar/SidebarViewController.swift | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Mac/MainWindow/Sidebar/SidebarViewController.swift b/Mac/MainWindow/Sidebar/SidebarViewController.swift index bc2c16d25..44dcae9b6 100644 --- a/Mac/MainWindow/Sidebar/SidebarViewController.swift +++ b/Mac/MainWindow/Sidebar/SidebarViewController.swift @@ -241,19 +241,16 @@ protocol SidebarDelegate: class { if availableSelectedNodes.count == 1 { if let folder = availableSelectedNodes.first?.representedObject as? Folder { - let localizedMessageText = "Delete the “%@” folder?" - alert.messageText = NSString.localizedStringWithFormat(localizedMessageText as NSString, folder.nameForDisplay) as String + alert.messageText = NSLocalizedString("Delete Folder", comment: "Delete Folder") let localizedInformativeText = NSLocalizedString("Are you sure you want to delete the “%@” folder?", comment: "Folder delete text") alert.informativeText = NSString.localizedStringWithFormat(localizedInformativeText as NSString, folder.nameForDisplay) as String } else if let feed = availableSelectedNodes.first?.representedObject as? Feed { - let localizedMessageText = "Delete the “%@” feed?" - alert.messageText = NSString.localizedStringWithFormat(localizedMessageText as NSString, feed.nameForDisplay) as String + alert.messageText = NSLocalizedString("Delete Feed", comment: "Delete Feed") let localizedInformativeText = NSLocalizedString("Are you sure you want to delete the “%@” feed?", comment: "Feed delete text") alert.informativeText = NSString.localizedStringWithFormat(localizedInformativeText as NSString, feed.nameForDisplay) as String } } else { - let localizedMessageText = "Delete the %d selected items?" - alert.messageText = NSString.localizedStringWithFormat(localizedMessageText as NSString, availableSelectedNodes.count) as String + alert.messageText = NSLocalizedString("Delete Items", comment: "Delete Items") let localizedInformativeText = NSLocalizedString("Are you sure you want to delete the %d selected items?", comment: "Items delete text") alert.informativeText = NSString.localizedStringWithFormat(localizedInformativeText as NSString, availableSelectedNodes.count) as String }