on-demand: macOS: Tunnel detail: List SSIDs

Signed-off-by: Roopesh Chander <roop@roopc.net>

diff --git a/WireGuard/WireGuard/Base.lproj/Localizable.strings b/WireGuard/WireGuard/Base.lproj/Localizable.strings
index 32b792ff32dea406cbc0c3356f7cb80f7f508357..6150a0ae70485fb93a5500f6e88f46f328b84165 100644 (file)
--- 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 152cbda56b5ee8425c7b199212636d0af16b09bb..06b505acf7fb994658f0b178feab0b60e652e360 100644 (file)
--- 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
         }