aboutsummaryrefslogtreecommitdiffstats
path: root/WireGuard/WireGuard/UI
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-12-07 18:35:06 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2018-12-07 18:52:14 +0100
commit66b4aedd087299751fa39c2b54dace6babcb3ac6 (patch)
tree814f8b7a79dbdef333c292726071fa08d133dae7 /WireGuard/WireGuard/UI
parentState restoration: Restore tunnel detail view (diff)
downloadwireguard-apple-66b4aedd087299751fa39c2b54dace6babcb3ac6.tar.xz
wireguard-apple-66b4aedd087299751fa39c2b54dace6babcb3ac6.zip
Make strings consistent
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'WireGuard/WireGuard/UI')
-rw-r--r--WireGuard/WireGuard/UI/TunnelViewModel.swift8
-rw-r--r--WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift4
-rw-r--r--WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift4
3 files changed, 8 insertions, 8 deletions
diff --git a/WireGuard/WireGuard/UI/TunnelViewModel.swift b/WireGuard/WireGuard/UI/TunnelViewModel.swift
index ea3adf4..f237660 100644
--- a/WireGuard/WireGuard/UI/TunnelViewModel.swift
+++ b/WireGuard/WireGuard/UI/TunnelViewModel.swift
@@ -454,13 +454,13 @@ extension TunnelViewModel {
func activateOnDemandOptionText(for activateOnDemandOption: ActivateOnDemandOption) -> String {
switch (activateOnDemandOption) {
case .none:
- return ""
+ return "Off"
case .useOnDemandOverWiFiOrCellular:
- return "Over WiFi or cellular"
+ return "Wi-Fi or cellular"
case .useOnDemandOverWiFiOnly:
- return "Over WiFi only"
+ return "Wi-Fi only"
case .useOnDemandOverCellularOnly:
- return "Over cellular only"
+ return "Cellular only"
}
}
diff --git a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
index 609fa2e..6623f79 100644
--- a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
@@ -94,7 +94,7 @@ class SettingsTableViewController: UITableViewController {
let dateFormatter = ISO8601DateFormatter()
dateFormatter.formatOptions = [.withFullDate, .withTime, .withTimeZone] // Avoid ':' in the filename
let timeStampString = dateFormatter.string(from: Date())
- let destinationURL = destinationDir.appendingPathComponent("WireGuard_iOS_log_\(timeStampString).txt")
+ let destinationURL = destinationDir.appendingPathComponent("wireguard-log-\(timeStampString).txt")
if (FileManager.default.fileExists(atPath: destinationURL.path)) {
let isDeleted = FileManager.deleteFile(at: destinationURL)
@@ -114,7 +114,7 @@ class SettingsTableViewController: UITableViewController {
try FileManager.default.copyItem(at: networkExtensionLogFileURL, to: destinationURL)
} catch {
os_log("Failed to copy file: %{public}@ to %{public}@: %{public}@", log: OSLog.default, type: .error, networkExtensionLogFileURL.absoluteString, destinationURL.absoluteString, error.localizedDescription)
- ErrorPresenter.showErrorAlert(title: "No log available", message: "The log could not be accessed", from: self)
+ ErrorPresenter.showErrorAlert(title: "Log export failed", message: "The log could not be copied", from: self)
return
}
diff --git a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
index b59c7b5..5873f1d 100644
--- a/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/TunnelDetailTableViewController.swift
@@ -433,9 +433,9 @@ class TunnelDetailTableViewActivateOnDemandCell: UITableViewCell {
case .none:
detailText = "Off"
case .useOnDemandOverWiFiOrCellular:
- detailText = "WiFi or cellular"
+ detailText = "Wi-Fi or cellular"
case .useOnDemandOverWiFiOnly:
- detailText = "WiFi only"
+ detailText = "Wi-Fi only"
case .useOnDemandOverCellularOnly:
detailText = "Cellular only"
}