summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2020-01-07 13:12:02 +0100
committerAndrej Mihajlov <and@mullvad.net>2020-01-08 15:02:46 +0100
commit82236054d8af5c433e5ace2bac0c40fb2a51fe61 (patch)
tree3e30601430c33c22aa8a43915e8dd06f3785fd30
parent03a2805c77f7055942ed8ad92cd750c1f199eeea (diff)
downloadmullvadvpn-82236054d8af5c433e5ace2bac0c40fb2a51fe61.tar.xz
mullvadvpn-82236054d8af5c433e5ace2bac0c40fb2a51fe61.zip
Remove tableName from localization
-rw-r--r--ios/MullvadVPN/AccountViewController.swift2
-rw-r--r--ios/MullvadVPN/ConnectViewController.swift6
-rw-r--r--ios/MullvadVPN/LoginViewController.swift14
-rw-r--r--ios/MullvadVPN/SettingsAccountCell.swift2
4 files changed, 12 insertions, 12 deletions
diff --git a/ios/MullvadVPN/AccountViewController.swift b/ios/MullvadVPN/AccountViewController.swift
index c51a8e6977..eefb680d0b 100644
--- a/ios/MullvadVPN/AccountViewController.swift
+++ b/ios/MullvadVPN/AccountViewController.swift
@@ -45,7 +45,7 @@ class AccountViewController: UIViewController {
let accountExpiry = AccountExpiry(date: expiryDate)
if accountExpiry.isExpired {
- expiryLabel.text = NSLocalizedString("OUT OF TIME", tableName: "Settings", comment: "")
+ expiryLabel.text = NSLocalizedString("OUT OF TIME", comment: "")
expiryLabel.textColor = .dangerColor
} else {
expiryLabel.text = accountExpiry.formattedDate
diff --git a/ios/MullvadVPN/ConnectViewController.swift b/ios/MullvadVPN/ConnectViewController.swift
index 8e9c4f09b7..f5924b224a 100644
--- a/ios/MullvadVPN/ConnectViewController.swift
+++ b/ios/MullvadVPN/ConnectViewController.swift
@@ -151,13 +151,13 @@ private extension TunnelState {
func textForSecureLabel() -> String {
switch self {
case .connecting, .reconnecting:
- return NSLocalizedString("Creating secure connection", tableName: "Connect", comment: "")
+ return NSLocalizedString("Creating secure connection", comment: "")
case .connected:
- return NSLocalizedString("Secure connection", tableName: "Connect", comment: "")
+ return NSLocalizedString("Secure connection", comment: "")
case .disconnecting, .disconnected:
- return NSLocalizedString("Unsecured connection", tableName: "Connect", comment: "")
+ return NSLocalizedString("Unsecured connection", comment: "")
}
}
diff --git a/ios/MullvadVPN/LoginViewController.swift b/ios/MullvadVPN/LoginViewController.swift
index 5f2733f6a4..faac384f3f 100644
--- a/ios/MullvadVPN/LoginViewController.swift
+++ b/ios/MullvadVPN/LoginViewController.swift
@@ -259,26 +259,26 @@ private extension LoginState {
var localizedTitle: String {
switch self {
case .default:
- return NSLocalizedString("Login", tableName: "Login", comment: "")
+ return NSLocalizedString("Login", comment: "")
case .authenticating:
- return NSLocalizedString("Logging in...", tableName: "Login", comment: "")
+ return NSLocalizedString("Logging in...", comment: "")
case .failure:
- return NSLocalizedString("Login failed", tableName: "Login", comment: "")
+ return NSLocalizedString("Login failed", comment: "")
case .success:
- return NSLocalizedString("Logged in", tableName: "Login", comment: "")
+ return NSLocalizedString("Logged in", comment: "")
}
}
var localizedMessage: String {
switch self {
case .default:
- return NSLocalizedString("Enter your account number", tableName: "Login", comment: "")
+ return NSLocalizedString("Enter your account number", comment: "")
case .authenticating:
- return NSLocalizedString("Checking account number", tableName: "Login", comment: "")
+ return NSLocalizedString("Checking account number", comment: "")
case .failure(let error):
if case .login(.invalidAccount) = error {
@@ -288,7 +288,7 @@ private extension LoginState {
}
case .success:
- return NSLocalizedString("Correct account number", tableName: "Login", comment: "")
+ return NSLocalizedString("Correct account number", comment: "")
}
}
}
diff --git a/ios/MullvadVPN/SettingsAccountCell.swift b/ios/MullvadVPN/SettingsAccountCell.swift
index cc959c7c46..755c57d87d 100644
--- a/ios/MullvadVPN/SettingsAccountCell.swift
+++ b/ios/MullvadVPN/SettingsAccountCell.swift
@@ -24,7 +24,7 @@ class SettingsAccountCell: SettingsCell {
let accountExpiry = AccountExpiry(date: accountExpiryDate)
if accountExpiry.isExpired {
- expiryLabel.text = NSLocalizedString("OUT OF TIME", tableName: "Settings", comment: "")
+ expiryLabel.text = NSLocalizedString("OUT OF TIME", comment: "")
expiryLabel.textColor = .dangerColor
} else {
let remainingTime = accountExpiry.formattedRemainingTime