Paywalls: prioritize Locale.current over Locale.preferredLocales

Sources/Logging/Strings/PaywallsStrings.swift

@@ -24,7 +24,7 @@ enum PaywallsStrings {
     case caching_presented_paywall
     case clearing_presented_paywall
 
-    case looking_up_localization([Locale])
+    case looking_up_localization(preferred: [Locale], search: [Locale])
     case found_localization(Locale)
     case fallback_localization(localeIdentifier: String)
 
@@ -60,8 +60,9 @@ extension PaywallsStrings: LogMessage {
         case .clearing_presented_paywall:
             return "PurchasesOrchestrator: clearing presented paywall"
 
-        case let .looking_up_localization(locales):
-            return "Looking up localized configuration for \(locales.map(\.identifier))"
+        case let .looking_up_localization(preferred, search):
+            return "Looking up localized configuration for \(preferred.map(\.identifier)), " +
+            "searching for \(search.map(\.identifier))"
 
         case let .found_localization(locale):
             return "Found localized configuration for '\(locale.identifier)'"

Sources/Paywalls/PaywallData+Localization.swift

@@ -22,8 +22,13 @@ public extension PaywallData {
     }
 
     // Visible for testing
-    internal func localizedConfiguration(for locales: [Locale]) -> LocalizedConfiguration {
-        Logger.verbose(Strings.paywalls.looking_up_localization(locales))
+    internal func localizedConfiguration(for preferredLocales: [Locale]) -> LocalizedConfiguration {
+        // Allows us to search each locale in order of priority, both with the region and without.
+        // Example: [en_UK, es_ES] => [en_UK, en, es_ES, es]
+        let locales: [Locale] = preferredLocales.flatMap { [$0, $0.removingRegion].compactMap { $0 } }
+
+        Logger.verbose(Strings.paywalls.looking_up_localization(preferred: preferredLocales,
+                                                                search: locales))
 
         let result: (locale: Locale, config: LocalizedConfiguration)? = locales
             .lazy
@@ -50,13 +55,7 @@ public extension PaywallData {
     /// - Returns: The list of locales that paywalls should try to search for.
     /// Includes `Locale.current` and `Locale.preferredLanguages`.
     internal static var localesOrderedByPriority: [Locale] {
-        var result = [.current] + Locale.preferredLocales
-
-        if let withoutRegion = Locale.current.removingRegion {
-            result.append(withoutRegion)
-        }
-
-        return result
+        return [.current] + Locale.preferredLocales
     }
 
     private var fallbackLocalizedConfiguration: (String, LocalizedConfiguration) {

Tests/UnitTests/Paywalls/PaywallDataTests.swift

@@ -127,9 +127,18 @@ class PaywallDataTests: BaseHTTPResponseTest {
 
         let enConfig = try XCTUnwrap(paywall.localizedConfiguration(for: [
             .init(identifier: "en_IN"),
-            .init(identifier: "en-IN"),
-            .init(identifier: "en-IN").removingRegion
-        ].compactMap { $0 }))
+            .init(identifier: "en-IN")
+        ]))
+        expect(enConfig.title) == "Paywall"
+    }
+
+    func testLocalizedConfigurationLooksForCurrentLocaleWithoutRegionBeforePreferedLocales() throws {
+        let paywall: PaywallData = try self.decodeFixture("PaywallData-Sample1")
+
+        let enConfig = try XCTUnwrap(paywall.localizedConfiguration(for: [
+            .init(identifier: "en_IN"),
+            .init(identifier: "es_ES")
+        ]))
         expect(enConfig.title) == "Paywall"
     }
 
@@ -139,14 +148,12 @@ class PaywallDataTests: BaseHTTPResponseTest {
         if #available(iOS 17.0, tvOS 17, watchOS 10, *) {
             expected = [
                 "en_US",
-                "en-US",
-                "en"
+                "en-US"
             ]
         } else {
             expected = [
                 "en_US",
                 // `Locale.preferredLanguages` returns `en` before iOS 17.
-                "en",
                 "en"
             ]
         }