Add locale extension

Author: lmarceau

firefox-ios/Client.xcodeproj/project.pbxproj

@@ -1048,6 +1048,7 @@
 		8A7C12612E01DB0F00F2D7FA /* SearchBarCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7C12602E01DB0C00F2D7FA /* SearchBarCell.swift */; };
 		8A7D08E32CAAF7C30035999C /* HomepageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7D08E22CAAF7C30035999C /* HomepageViewController.swift */; };
 		8A7D1AC52BA3542600162F4B /* splashScreen.json in Resources */ = {isa = PBXBuildFile; fileRef = 8A7D1AC42BA3542600162F4B /* splashScreen.json */; };
+		8A8053B32E6A1BBF00FEDDA4 /* Locale+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A8053B22E6A1BB300FEDDA4 /* Locale+Extension.swift */; };
 		8A8158CB2C2C77B000281F72 /* MicrosurveyTelemetry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A8158CA2C2C77B000281F72 /* MicrosurveyTelemetry.swift */; };
 		8A827E302C20C7F5008D5E3C /* MicrosurveyMiddlewareTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A827E2E2C20C55E008D5E3C /* MicrosurveyMiddlewareTests.swift */; };
 		8A827E322C20C8AE008D5E3C /* MockMicrosurveySurfaceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A827E312C20C8AE008D5E3C /* MockMicrosurveySurfaceManager.swift */; };
@@ -8748,6 +8749,7 @@
 		8A7C12602E01DB0C00F2D7FA /* SearchBarCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchBarCell.swift; sourceTree = "<group>"; };
 		8A7D08E22CAAF7C30035999C /* HomepageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomepageViewController.swift; sourceTree = "<group>"; };
 		8A7D1AC42BA3542600162F4B /* splashScreen.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = splashScreen.json; sourceTree = "<group>"; };
+		8A8053B22E6A1BB300FEDDA4 /* Locale+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Locale+Extension.swift"; sourceTree = "<group>"; };
 		8A8158CA2C2C77B000281F72 /* MicrosurveyTelemetry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicrosurveyTelemetry.swift; sourceTree = "<group>"; };
 		8A827E2E2C20C55E008D5E3C /* MicrosurveyMiddlewareTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicrosurveyMiddlewareTests.swift; sourceTree = "<group>"; };
 		8A827E312C20C8AE008D5E3C /* MockMicrosurveySurfaceManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockMicrosurveySurfaceManager.swift; sourceTree = "<group>"; };
@@ -11768,6 +11770,7 @@
 		28EADE5C1AFC3A6D007FB2FB /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
+				8A8053B22E6A1BB300FEDDA4 /* Locale+Extension.swift */,
 				9609F4C926B57CE800F81493 /* Calendar+Extension.swift */,
 				E1442FBE294782B6003680B0 /* CGRect+Extension.swift */,
 				4393931F29AC6CE900DC5A85 /* EnvironmentValues+Extension.swift */,
@@ -18889,6 +18892,7 @@
 				E6327A641BF6438E008D12E0 /* DebugSettingsBundleOptions.swift in Sources */,
 				EDBD5C1C2DFA248E0050A59A /* HistoryTelemetry.swift in Sources */,
 				F85C7EDD27109241004BDBA4 /* PasswordManagerOnboardingViewController.swift in Sources */,
+				8A8053B32E6A1BBF00FEDDA4 /* Locale+Extension.swift in Sources */,
 				612194E32CE507CF001664BB /* WallpaperBackgroundView.swift in Sources */,
 				D8FDEB57220CFE970069A582 /* UIImage+ImageEffects.m in Sources */,
 				0BDDB3462CA6E43A00D501DF /* BookmarksSaver.swift in Sources */,

firefox-ios/Client/Application/RemoteSettings/Application Services/ASSearchEngineProvider.swift

@@ -115,7 +115,7 @@ final class ASSearchEngineProvider: SearchEngineProvider, Sendable {
                                                possibleLanguageIdentifier: [String],
                                                completion: @escaping ([OpenSearchEngine]) -> Void ) {
         let localeCode = localeCode(from: locale)
-        let region = regionCode(from: locale)
+        let region = locale.regionCode()
         let logger = self.logger
         guard let iconPopulator = iconDataFetcher, let selector else {
             let logExtra1 = iconDataFetcher == nil ? "nil" : "ok"
@@ -174,14 +174,4 @@ final class ASSearchEngineProvider: SearchEngineProvider, Sendable {
             return identifier
         }
     }
-
-    private func regionCode(from locale: Locale) -> String {
-        let systemRegion: String?
-        if #available(iOS 17, *) {
-            systemRegion = (locale as NSLocale).regionCode
-        } else {
-            systemRegion = (locale as NSLocale).countryCode
-        }
-        return systemRegion ?? locale.identifier.components(separatedBy: "-").last ?? "US"
-    }
 }

firefox-ios/Client/Extensions/Locale+Extension.swift

@@ -0,0 +1,15 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+extension Locale {
+    func regionCode() -> String {
+        let systemRegion: String?
+        if #available(iOS 17, *) {
+            systemRegion = (self as NSLocale).regionCode
+        } else {
+            systemRegion = (self as NSLocale).countryCode
+        }
+        return systemRegion ?? self.identifier.components(separatedBy: "-").last ?? "US"
+    }
+}

firefox-ios/Client/Telemetry/FxSuggestTelemetry.swift

@@ -18,7 +18,7 @@ class FxSuggestTelemetry {
     private let systemRegion: String
 
     init(locale: Locale = Locale.current) {
-        systemRegion = Self.regionCode(from: locale)
+        systemRegion = locale.regionCode()
     }
 
     func clickEvent(telemetryInfo: RustFirefoxSuggestionTelemetryInfo, position: Int) {
@@ -96,14 +96,4 @@ class FxSuggestTelemetry {
         }
         GleanMetrics.Pings.shared.fxSuggest.submit()
     }
-
-    private static func regionCode(from locale: Locale) -> String {
-        let systemRegion: String?
-        if #available(iOS 17, *) {
-            systemRegion = (locale as NSLocale).regionCode
-        } else {
-            systemRegion = (locale as NSLocale).countryCode
-        }
-        return systemRegion ?? locale.identifier.components(separatedBy: "-").last ?? "US"
-    }
 }