From 40b68f6ec64d04b27c5f3c4a30284d0ab0bf2c92 Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Thu, 21 May 2020 05:16:39 -0500 Subject: [PATCH] Revert "Update "Open in Browser" menu item title as well" This reverts commit 4b2fe7789895993a8bb0e034703bbb7c5a99f6d8. --- Mac/AppDelegate.swift | 28 ---------------------------- Mac/Base.lproj/Main.storyboard | 1 - 2 files changed, 29 deletions(-) diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index 0b3f94d23..e8fbaa4ce 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -59,7 +59,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, @IBOutlet var sortByNewestArticleOnTopMenuItem: NSMenuItem! @IBOutlet var groupArticlesByFeedMenuItem: NSMenuItem! @IBOutlet var checkForUpdatesMenuItem: NSMenuItem! - @IBOutlet var openInBrowserMenuItem: NSMenuItem! var unreadCount = 0 { didSet { @@ -111,9 +110,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, NotificationCenter.default.addObserver(self, selector: #selector(inspectableObjectsDidChange(_:)), name: .InspectableObjectsDidChange, object: nil) NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(didWakeNotification(_:)), name: NSWorkspace.didWakeNotification, object: nil) - NotificationCenter.default.addObserver(self, selector: #selector(defaultBrowserDidChange(_:)), name: .DefaultBrowserDidChange, object: nil) - NotificationCenter.default.addObserver(self, selector: #selector(defaultBrowserDidChange(_:)), name: NSApplication.willBecomeActiveNotification, object: nil) - appDelegate = self } @@ -730,30 +726,6 @@ private extension AppDelegate { let groupByFeedEnabled = AppDefaults.timelineGroupByFeed groupArticlesByFeedMenuItem.state = groupByFeedEnabled ? .on : .off } - - func updateOpenInBrowserMenuItem() { - var browserName = NSLocalizedString("Browser", comment: "Browser") - - var currentBrowser: MacWebBrowser? - - if let browserID = AppDefaults.defaultBrowserID { - currentBrowser = MacWebBrowser(bundleIdentifier: browserID) - } else { - currentBrowser = MacWebBrowser.default - } - - if let currentBrowser = currentBrowser { - browserName = currentBrowser.name! - } - - let format = NSLocalizedString("Open in %@", comment: "Open in Browser menu item title format") - openInBrowserMenuItem.title = String(format: format, browserName) - - } - - @objc func defaultBrowserDidChange(_ note: Notification) { - updateOpenInBrowserMenuItem() - } } /* diff --git a/Mac/Base.lproj/Main.storyboard b/Mac/Base.lproj/Main.storyboard index 19cbb5704..dcccfcf9c 100644 --- a/Mac/Base.lproj/Main.storyboard +++ b/Mac/Base.lproj/Main.storyboard @@ -659,7 +659,6 @@ -