diff --git a/phpmon/Common/Extensions/StringExtension.swift b/phpmon/Common/Extensions/StringExtension.swift index 085e9676..6cadf9ce 100644 --- a/phpmon/Common/Extensions/StringExtension.swift +++ b/phpmon/Common/Extensions/StringExtension.swift @@ -164,4 +164,10 @@ extension String { of: "^[0-9]*$", // 1 options: .regularExpression) != nil } + + // MARK: - Helpers + + var withDisplayName: String { + return self.replacing("PHP Monitor", with: App.displayName) + } } diff --git a/phpmon/Domain/App/App.swift b/phpmon/Domain/App/App.swift index 1ed9a025..41e12599 100644 --- a/phpmon/Domain/App/App.swift +++ b/phpmon/Domain/App/App.swift @@ -17,8 +17,8 @@ class App { /** Use to determine whether a loaded testable configuration is being used. */ static var hasLoadedTestableConfiguration: Bool = false - /** The name of the app. Has EAP suffixed when an actual EAP build. */ - static var name: String { + /** The display name of the app, as declared in Info.plist. */ + static var displayName: String { return Bundle.main.infoDictionary?["CFBundleName"] as! String } diff --git a/phpmon/Domain/Menu/StatusMenu+Items.swift b/phpmon/Domain/Menu/StatusMenu+Items.swift index 9910a267..0fcd0e46 100644 --- a/phpmon/Domain/Menu/StatusMenu+Items.swift +++ b/phpmon/Domain/Menu/StatusMenu+Items.swift @@ -127,9 +127,9 @@ extension StatusMenu { @MainActor func addCoreMenuItems() { addItems([ NSMenuItem.separator(), - NSMenuItem(title: "mi_about".localized.replacing("PHP Monitor", with: App.name), + NSMenuItem(title: "mi_about".localized.withDisplayName, action: #selector(MainMenu.openAbout)), - NSMenuItem(title: "mi_quit".localized.replacing("PHP Monitor", with: App.name), + NSMenuItem(title: "mi_quit".localized.withDisplayName, action: #selector(MainMenu.terminateApp), keyEquivalent: "q") ]) }