passepartoutvpn/wireguard-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/wireguard-apple.git synced 2025-02-12 19:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS: s/macMenuStatus/macStatus/g;

Browse Source
This commit is contained in:
Roopesh Chander 2019-01-03 17:49:32 +05:30
parent 50ed363ef2
commit 9535a0c585
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
WireGuard/WireGuard/Base.lproj/Localizable.strings
View File

@ -223,7 +223,6 @@
// Mac status bar menu // Mac status bar menu
"macMenuStatus (%@)" = "Status: %@";
"macMenuNetworks (%@)" = "Networks: %@"; "macMenuNetworks (%@)" = "Networks: %@";
"macMenuNetworksInactive" = "Networks: -"; "macMenuNetworksInactive" = "Networks: -";
"macMenuNetworksNone" = "Networks: None"; "macMenuNetworksNone" = "Networks: None";
@ -234,3 +233,7 @@
// Mac detail view fields // Mac detail view fields
"macDetailFieldKey (%@)" = "%@:"; "macDetailFieldKey (%@)" = "%@:";
// Mac status display
"macStatus (%@)" = "Status: %@";

4
WireGuard/WireGuard/UI/macOS/StatusMenu.swift
View File

@ -39,7 +39,7 @@ class StatusMenu: NSMenu {
} }
func addStatusMenuItems() { func addStatusMenuItems() {
let statusTitle = tr(format: "macMenuStatus (%@)", tr("tunnelStatusInactive")) let statusTitle = tr(format: "macStatus (%@)", tr("tunnelStatusInactive"))
let statusMenuItem = NSMenuItem(title: statusTitle, action: #selector(manageTunnelsClicked), keyEquivalent: "") let statusMenuItem = NSMenuItem(title: statusTitle, action: #selector(manageTunnelsClicked), keyEquivalent: "")
statusMenuItem.isEnabled = false statusMenuItem.isEnabled = false
addItem(statusMenuItem) addItem(statusMenuItem)
@ -75,7 +75,7 @@ class StatusMenu: NSMenu {
statusText = tr("tunnelStatusRestarting") statusText = tr("tunnelStatusRestarting")
} }
statusMenuItem.title = tr(format: "macMenuStatus (%@)", statusText) statusMenuItem.title = tr(format: "macStatus (%@)", statusText)
let addresses = tunnel.tunnelConfiguration?.interface.addresses ?? [] let addresses = tunnel.tunnelConfiguration?.interface.addresses ?? []
let addressesString = addresses.map { $0.stringRepresentation }.joined(separator: ", ") let addressesString = addresses.map { $0.stringRepresentation }.joined(separator: ", ")