diff options
| -rw-r--r-- | Sources/WireGuardApp/Base.lproj/Localizable.strings | 2 | ||||
| -rw-r--r-- | Sources/WireGuardApp/Tunnel/TunnelErrors.swift | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Sources/WireGuardApp/Base.lproj/Localizable.strings b/Sources/WireGuardApp/Base.lproj/Localizable.strings index 8127fe5..2974ba7 100644 --- a/Sources/WireGuardApp/Base.lproj/Localizable.strings +++ b/Sources/WireGuardApp/Base.lproj/Localizable.strings @@ -260,8 +260,6 @@ "alertTunnelActivationFileDescriptorFailureMessage" = "Unable to determine TUN device file descriptor."; "alertTunnelActivationSetNetworkSettingsMessage" = "Unable to apply network settings to tunnel object."; -"alertTunnelActivationFailureOnDemandAddendum" = " This tunnel has Activate On Demand enabled, so this tunnel might be re-activated automatically by the OS. You may turn off Activate On Demand in this app by editing the tunnel configuration."; - "alertTunnelDNSFailureTitle" = "DNS resolution failure"; "alertTunnelDNSFailureMessage" = "One or more endpoint domains could not be resolved."; diff --git a/Sources/WireGuardApp/Tunnel/TunnelErrors.swift b/Sources/WireGuardApp/Tunnel/TunnelErrors.swift index 99c90d0..7031646 100644 --- a/Sources/WireGuardApp/Tunnel/TunnelErrors.swift +++ b/Sources/WireGuardApp/Tunnel/TunnelErrors.swift @@ -56,10 +56,10 @@ enum TunnelsManagerActivationError: WireGuardAppError { var alertText: AlertText { switch self { - case .activationFailed(let wasOnDemandEnabled): - return (tr("alertTunnelActivationFailureTitle"), tr("alertTunnelActivationFailureMessage") + (wasOnDemandEnabled ? tr("alertTunnelActivationFailureOnDemandAddendum") : "")) - case .activationFailedWithExtensionError(let title, let message, let wasOnDemandEnabled): - return (title, message + (wasOnDemandEnabled ? tr("alertTunnelActivationFailureOnDemandAddendum") : "")) + case .activationFailed: + return (tr("alertTunnelActivationFailureTitle"), tr("alertTunnelActivationFailureMessage")) + case .activationFailedWithExtensionError(let title, let message, _): + return (title, message) } } } |