Merge branch 'fix-trnslations-bugs-iOS'

6 files changed, 24 insertions, 8 deletions

diff --git a/ios/MullvadVPN/Coordinators/Settings/SettingsCoordinator.swift b/ios/MullvadVPN/Coordinators/Settings/SettingsCoordinator.swift
index b24e72ed53..d050acfada 100644
--- a/ios/MullvadVPN/Coordinators/Settings/SettingsCoordinator.swift
+++ b/ios/MullvadVPN/Coordinators/Settings/SettingsCoordinator.swift
@@ -139,7 +139,8 @@ final class SettingsCoordinator: Coordinator, Presentable, Presenting, SettingsV
 
             logger.debug("Show modal \(route)")
 
-            let safariCoordinator = SafariCoordinator(url: ApplicationConfiguration.faqAndGuidesURL)
+            let safariCoordinator = SafariCoordinator(
+                url: ApplicationConfiguration.faqAndGuidesURL(for: ApplicationLanguage.currentLanguage.id))
 
             safariCoordinator.didFinish = { [weak self] in
                 self?.modalRoute = nil
diff --git a/ios/MullvadVPN/Coordinators/SetupAccountCompletedCoordinator.swift b/ios/MullvadVPN/Coordinators/SetupAccountCompletedCoordinator.swift
index 1c95408279..3b51a77091 100644
--- a/ios/MullvadVPN/Coordinators/SetupAccountCompletedCoordinator.swift
+++ b/ios/MullvadVPN/Coordinators/SetupAccountCompletedCoordinator.swift
@@ -36,7 +36,10 @@ class SetupAccountCompletedCoordinator: Coordinator, Presenting {
 
 extension SetupAccountCompletedCoordinator: @preconcurrency SetupAccountCompletedControllerDelegate {
     func didRequestToSeePrivacy(controller: SetupAccountCompletedController) {
-        presentChild(SafariCoordinator(url: ApplicationConfiguration.privacyGuidesURL), animated: true)
+        presentChild(
+            SafariCoordinator(
+                url: ApplicationConfiguration.privacyGuidesURL(for: ApplicationLanguage.currentLanguage.id)),
+            animated: true)
     }
 
     func didRequestToStartTheApp(controller: SetupAccountCompletedController) {
diff --git a/ios/MullvadVPN/View controllers/ProblemReport/ReduceAnonymityWarningView.swift b/ios/MullvadVPN/View controllers/ProblemReport/ReduceAnonymityWarningView.swift
index b27547fa81..31f004b431 100644
--- a/ios/MullvadVPN/View controllers/ProblemReport/ReduceAnonymityWarningView.swift
+++ b/ios/MullvadVPN/View controllers/ProblemReport/ReduceAnonymityWarningView.swift
@@ -134,7 +134,8 @@ class ReduceAnonymityWarningView: UIView {
     }
 
     @objc func openPrivacyPolicy() {
-        UIApplication.shared.open(URL(string: ApplicationConfiguration.privacyPolicyLink)!)
+        UIApplication.shared.open(
+            URL(string: ApplicationConfiguration.privacyPolicyLink(for: ApplicationLanguage.currentLanguage.id))!)
     }
 
     required init?(coder: NSCoder) {
diff --git a/ios/MullvadVPN/View controllers/TermsOfService/TermsOfServiceView.swift b/ios/MullvadVPN/View controllers/TermsOfService/TermsOfServiceView.swift
index 4bbd506d80..590a850ab7 100644
--- a/ios/MullvadVPN/View controllers/TermsOfService/TermsOfServiceView.swift
+++ b/ios/MullvadVPN/View controllers/TermsOfService/TermsOfServiceView.swift
@@ -46,7 +46,9 @@ struct TermsOfServiceView: View {
             HStack {
                 Text(
                     LocalizedStringKey(
-                        stringLiteral: "[\(privacyPolicyText)](\(ApplicationConfiguration.privacyPolicyLink))")
+                        stringLiteral:
+                            "[\(privacyPolicyText)](\(ApplicationConfiguration.privacyPolicyLink(for :ApplicationLanguage.currentLanguage.id)))"
+                    )
                 )
                 .font(.mullvadSmall)
                 .underline(true, color: .white)
diff --git a/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/ConnectionViewViewModel.swift b/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/ConnectionViewViewModel.swift
index a822e05379..2d8546ac45 100644
--- a/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/ConnectionViewViewModel.swift
+++ b/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/ConnectionViewViewModel.swift
@@ -179,7 +179,10 @@ extension ConnectionViewViewModel {
             return nil
         }
 
-        return LocalizedStringKey("\(tunnelRelays.exit.location.country), \(tunnelRelays.exit.location.city)")
+        let country = NSLocalizedString(tunnelRelays.exit.location.country, comment: "")
+        let city = NSLocalizedString(tunnelRelays.exit.location.city, comment: "")
+
+        return LocalizedStringKey("\(country), \(city)")
     }
 
     var titleForServer: LocalizedStringKey? {
diff --git a/ios/Shared/ApplicationConfiguration.swift b/ios/Shared/ApplicationConfiguration.swift
index ffb01dd013..0d91608d6f 100644
--- a/ios/Shared/ApplicationConfiguration.swift
+++ b/ios/Shared/ApplicationConfiguration.swift
@@ -63,13 +63,19 @@ enum ApplicationConfiguration {
     static let logMaximumFileSize: UInt64 = 131_072  // 128 kB.
 
     /// Privacy policy URL.
-    static let privacyPolicyLink = "https://\(Self.hostName)/help/privacy-policy/"
+    static func privacyPolicyLink(for language: String) -> String {
+        "https://\(Self.hostName)/\(language)/help/privacy-policy/"
+    }
 
     /// Make a start regarding  policy URL.
-    static let privacyGuidesURL = URL(string: "https://\(Self.hostName)/help/first-steps-towards-online-privacy/")!
+    static func privacyGuidesURL(for language: String) -> URL {
+        URL(string: "https://\(Self.hostName)/\(language)/help/first-steps-towards-online-privacy/")!
+    }
 
     /// FAQ & Guides URL.
-    static let faqAndGuidesURL = URL(string: "https://\(Self.hostName)/help/tag/mullvad-app/")!
+    static func faqAndGuidesURL(for language: String) -> URL {
+        URL(string: "https://\(Self.hostName)/\(language)/help/tag/mullvad-app/")!
+    }
 
     /// Maximum number of devices per account.
     static let maxAllowedDevices = 5