aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoopesh Chander <roop@roopc.net>2019-03-09 16:05:22 +0530
committerJason A. Donenfeld <Jason@zx2c4.com>2019-03-18 06:46:55 +0100
commit63299a2752530a00706f5d3e42f1d4b8310e1f08 (patch)
treea611298e6fa741ef34969f643bd00f892931a1f2
parenton-demand: iOS: Only n SSIDs / Except m SSIDs (diff)
downloadwireguard-apple-63299a2752530a00706f5d3e42f1d4b8310e1f08.tar.xz
wireguard-apple-63299a2752530a00706f5d3e42f1d4b8310e1f08.zip
on-demand: macOS: Tunnel detail: List SSIDs
Signed-off-by: Roopesh Chander <roop@roopc.net>
-rw-r--r--WireGuard/WireGuard/Base.lproj/Localizable.strings1
-rw-r--r--WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift10
2 files changed, 10 insertions, 1 deletions
diff --git a/WireGuard/WireGuard/Base.lproj/Localizable.strings b/WireGuard/WireGuard/Base.lproj/Localizable.strings
index 32b792ff..6150a0ae 100644
--- a/WireGuard/WireGuard/Base.lproj/Localizable.strings
+++ b/WireGuard/WireGuard/Base.lproj/Localizable.strings
@@ -93,6 +93,7 @@
"tunnelOnDemandOnlySSIDs (%d)" = "Only %d SSIDs";
"tunnelOnDemandExceptSSID (%d)" = "Except %d SSID";
"tunnelOnDemandExceptSSIDs (%d)" = "Except %d SSIDs";
+"tunnelOnDemandSSIDOptionDescriptionMac (%1$@: %2$@)" = "%1$@: %2$@";
"tunnelOnDemandSSIDViewTitle" = "SSIDs";
"tunnelOnDemandSectionTitleSelectedSSIDs" = "SSIDs";
diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift
index 152cbda5..06b505ac 100644
--- a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift
+++ b/WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift
@@ -403,7 +403,15 @@ extension TunnelDetailTableViewController: NSTableViewDelegate {
case .onDemandSSIDRow:
let cell: KeyValueRow = tableView.dequeueReusableCell()
cell.key = tr("macFieldOnDemandSSIDs")
- cell.value = onDemandViewModel.ssidOption.localizedUIString
+ let value: String
+ if onDemandViewModel.ssidOption == .anySSID {
+ value = onDemandViewModel.ssidOption.localizedUIString
+ } else {
+ value = tr(format: "tunnelOnDemandSSIDOptionDescriptionMac (%1$@: %2$@)",
+ onDemandViewModel.ssidOption.localizedUIString,
+ onDemandViewModel.selectedSSIDs.joined(separator: ", "))
+ }
+ cell.value = value
cell.isKeyInBold = false
return cell
}