Merge branch 'localize-select-location'

6 files changed, 31 insertions, 4 deletions

diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
index 878b7e56f0..c12aa1565a 100644
--- a/ios/MullvadVPN.xcodeproj/project.pbxproj
+++ b/ios/MullvadVPN.xcodeproj/project.pbxproj
@@ -226,6 +226,7 @@
 		58F558E02695BD3E00F630D0 /* Login.strings in Resources */ = {isa = PBXBuildFile; fileRef = 58F558DE2695BD3E00F630D0 /* Login.strings */; };
 		58F558E32695D1D800F630D0 /* Preferences.strings in Resources */ = {isa = PBXBuildFile; fileRef = 58F558E12695D1D800F630D0 /* Preferences.strings */; };
 		58F558E62695D1F200F630D0 /* ProblemReport.strings in Resources */ = {isa = PBXBuildFile; fileRef = 58F558E42695D1F200F630D0 /* ProblemReport.strings */; };
+		58F558E92695D20F00F630D0 /* SelectLocation.strings in Resources */ = {isa = PBXBuildFile; fileRef = 58F558E72695D20F00F630D0 /* SelectLocation.strings */; };
 		58F5590E2697002100F630D0 /* Main.strings in Resources */ = {isa = PBXBuildFile; fileRef = 58F559052697002000F630D0 /* Main.strings */; };
 		58F5590F2697002100F630D0 /* ConnectionPanel.strings in Resources */ = {isa = PBXBuildFile; fileRef = 58F559072697002100F630D0 /* ConnectionPanel.strings */; };
 		58F61F4F2692F21C00DCFC2B /* WireguardKeys.strings in Resources */ = {isa = PBXBuildFile; fileRef = 58F61F4D2692F21C00DCFC2B /* WireguardKeys.strings */; };
@@ -448,6 +449,7 @@
 		58F558DF2695BD3E00F630D0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Login.strings; sourceTree = "<group>"; };
 		58F558E22695D1D800F630D0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Preferences.strings; sourceTree = "<group>"; };
 		58F558E52695D1F200F630D0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/ProblemReport.strings; sourceTree = "<group>"; };
+		58F558E82695D20F00F630D0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SelectLocation.strings; sourceTree = "<group>"; };
 		58F559062697002000F630D0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
 		58F559082697002100F630D0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/ConnectionPanel.strings; sourceTree = "<group>"; };
 		58F61F4E2692F21C00DCFC2B /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/WireguardKeys.strings; sourceTree = "<group>"; };
@@ -563,6 +565,7 @@
 				58F559052697002000F630D0 /* Main.strings */,
 				58F558E12695D1D800F630D0 /* Preferences.strings */,
 				58F558E42695D1F200F630D0 /* ProblemReport.strings */,
+				58F558E72695D20F00F630D0 /* SelectLocation.strings */,
 				582CFEE8269463B80072883A /* Settings.strings */,
 				58F61F4D2692F21C00DCFC2B /* WireguardKeys.strings */,
 			);
@@ -976,6 +979,7 @@
 				58F5590F2697002100F630D0 /* ConnectionPanel.strings in Resources */,
 				58F558E02695BD3E00F630D0 /* Login.strings in Resources */,
 				58CE5E6B224146210008646E /* Assets.xcassets in Resources */,
+				58F558E92695D20F00F630D0 /* SelectLocation.strings in Resources */,
 				5883A09E266A5AF7003EFFCB /* Localizable.strings in Resources */,
 				58F558E32695D1D800F630D0 /* Preferences.strings in Resources */,
 				582CFEE726945FC30072883A /* AppStoreSubscriptions.strings in Resources */,
@@ -1345,6 +1349,14 @@
 			name = ProblemReport.strings;
 			sourceTree = "<group>";
 		};
+		58F558E72695D20F00F630D0 /* SelectLocation.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				58F558E82695D20F00F630D0 /* en */,
+			);
+			name = SelectLocation.strings;
+			sourceTree = "<group>";
+		};
 		58F559052697002000F630D0 /* Main.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
diff --git a/ios/MullvadVPN/AppDelegate.swift b/ios/MullvadVPN/AppDelegate.swift
index 9bc80732fa..4f7990d636 100644
--- a/ios/MullvadVPN/AppDelegate.swift
+++ b/ios/MullvadVPN/AppDelegate.swift
@@ -511,7 +511,6 @@ extension AppDelegate: ConnectViewControllerDelegate {
 
     func connectViewControllerShouldShowSelectLocationPicker(_ controller: ConnectViewController) {
         let contentController = makeSelectLocationController()
-        contentController.navigationItem.title = NSLocalizedString("Select location", comment: "Navigation title")
         contentController.navigationItem.largeTitleDisplayMode = .never
         contentController.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(handleDismissSelectLocationController(_:)))
 
diff --git a/ios/MullvadVPN/SelectLocationCell.swift b/ios/MullvadVPN/SelectLocationCell.swift
index a86543d430..d297b719dd 100644
--- a/ios/MullvadVPN/SelectLocationCell.swift
+++ b/ios/MullvadVPN/SelectLocationCell.swift
@@ -216,8 +216,8 @@ class SelectLocationCell: BasicTableViewCell {
     private func updateAccessibilityCustomActions() {
         if showsCollapseControl {
             let actionName = isExpanded
-                ? NSLocalizedString("SELECT_LOCATION_COLLAPSE_ACCESSIBILITY_ACTION", comment: "")
-                : NSLocalizedString("SELECT_LOCATION_EXPAND_ACCESSIBILITY_ACTION", comment: "")
+                ? NSLocalizedString("SELECT_LOCATION_COLLAPSE_ACCESSIBILITY_ACTION", tableName: "SelectLocation", comment: "")
+                : NSLocalizedString("SELECT_LOCATION_EXPAND_ACCESSIBILITY_ACTION", tableName: "SelectLocation", comment: "")
 
             accessibilityCustomActions = [
                 UIAccessibilityCustomAction(name: actionName, target: self, selector: #selector(toggleCollapseAccessibilityAction))
diff --git a/ios/MullvadVPN/SelectLocationHeaderView.swift b/ios/MullvadVPN/SelectLocationHeaderView.swift
index 60a1cd75cf..a8428982fe 100644
--- a/ios/MullvadVPN/SelectLocationHeaderView.swift
+++ b/ios/MullvadVPN/SelectLocationHeaderView.swift
@@ -16,7 +16,11 @@ class SelectLocationHeaderView: UIView {
         textLabel.font = UIFont.systemFont(ofSize: 17)
         textLabel.textColor = UIColor(white: 1, alpha: 0.6)
         textLabel.numberOfLines = 0
-        textLabel.text = NSLocalizedString("While connected, your real location is masked with a private and secure location in the selected region", comment: "")
+        textLabel.text = NSLocalizedString(
+            "SUBHEAD_LABEL",
+            tableName: "SelectLocation",
+            comment: "Subhead label displayed below navigation title."
+        )
         return textLabel
     }()
 
diff --git a/ios/MullvadVPN/SelectLocationViewController.swift b/ios/MullvadVPN/SelectLocationViewController.swift
index a5cffcc452..ad9884d3fe 100644
--- a/ios/MullvadVPN/SelectLocationViewController.swift
+++ b/ios/MullvadVPN/SelectLocationViewController.swift
@@ -53,6 +53,7 @@ class SelectLocationViewController: UIViewController, UITableViewDelegate {
         super.viewDidLoad()
 
         navigationItem.largeTitleDisplayMode = .never
+        navigationItem.title = NSLocalizedString("NAVIGATION_TITLE", tableName: "SelectLocation", comment: "Navigation title")
 
         let tableView = UITableView(frame: view.bounds, style: .plain)
         tableView.translatesAutoresizingMaskIntoConstraints = false
diff --git a/ios/MullvadVPN/en.lproj/SelectLocation.strings b/ios/MullvadVPN/en.lproj/SelectLocation.strings
new file mode 100644
index 0000000000..8d95fafbee
--- /dev/null
+++ b/ios/MullvadVPN/en.lproj/SelectLocation.strings
@@ -0,0 +1,11 @@
+/* Navigation title */
+"NAVIGATION_TITLE" = "Select Location";
+
+/* No comment provided by engineer. */
+"SELECT_LOCATION_COLLAPSE_ACCESSIBILITY_ACTION" = "Collapse location";
+
+/* No comment provided by engineer. */
+"SELECT_LOCATION_EXPAND_ACCESSIBILITY_ACTION" = "Expand location";
+
+/* Subhead label displayed below navigation title. */
+"SUBHEAD_LABEL" = "While connected, your real location is masked with a private and secure location in the selected region";