Paywalls: fix finding locales with different regions
#3633
Conversation
This was a regression introduced by #3605. ### Example: Consider a paywall configuration with these locales: `en_US`, `de_DE`. Running on a device with locale `en_IN` for example. Before #3605, `PaywallData.localizedConfiguration` would have returned the `en_US` localization. However, that change made it so that it could no longer find a matching localization with a different region.' This fix improves the locale lookup so that if it doesn't find a matching localization with both language AND region, it then tries to look it up with only the language, before falling back to the default localization.
| var result = [.current] + Locale.preferredLocales | ||
|
|
||
| if let withoutRegion = Locale.current.removingRegion { | ||
| result.append(withoutRegion) |
| expect(enConfig.title) == "Paywall" | ||
| } | ||
|
|
||
| func testLocalesOrderedByPriority() { |
There was a problem hiding this comment.
Now we also have a test for this logic
| func testLocalizedConfigurationFallsBackToLanguageWithDifferentRegion() throws { | ||
| let paywall: PaywallData = try self.decodeFixture("PaywallData-Sample1") | ||
|
|
||
| let enConfig = try XCTUnwrap(paywall.localizedConfiguration(for: [ |
There was a problem hiding this comment.
And also have a test for this method, which we didn't have before.
| let enConfig = try XCTUnwrap(paywall.localizedConfiguration(for: [ | ||
| .init(identifier: "en_IN"), | ||
| .init(identifier: "en-IN"), | ||
| .init(identifier: "en-IN").removingRegion |
There was a problem hiding this comment.
The fact that this is included in Paywall.localizedConfiguration is tested below.
| .init(identifier: "en-IN"), | ||
| .init(identifier: "en-IN").removingRegion | ||
| ].compactMap { $0 })) | ||
| expect(enConfig.title) == "Paywall" |
There was a problem hiding this comment.
This was a failing test before the fix.
NachoSoto
force-pushed
the
paywalls-language-bug
branch
from
1d01985
to
c4a1dc2
Compare
NachoSoto
force-pushed
the
paywalls-language-bug
branch
from
c4a1dc2
to
a9589ff
Compare
Test coverage to ensure that Android isn't affected by RevenueCat/purchases-ios#3633. I've also extracted `getDefaultLocales` and `localizedConfiguration(List<Locale>)` so we can test those.
Test coverage to ensure that Android isn't affected by RevenueCat/purchases-ios#3633. I've also extracted `getDefaultLocales` and `localizedConfiguration(List<Locale>)` so we can test those.
|
After upgrading to this version, I still see this problem. RevenueCat only allows German localization for "German (Germany)" and my iOS application (and my iPhone's settings) is localized for "German". Even after 4.36.0 is applied, I am seeing the English Paywall when my phone is set to "German". When I set the phone to "German (Germany)" I see German. When I set it to "German (Switzerland)" I also see English. I sent an extensive steps to reproduce, expected and observed behavior, and test cases via email attached to my support ticket on this topic. |
Will make debugging issues like #3633 and #3633 (comment) easier. ``` VERBOSE: Looking up localized configuration for ["de_SW", "de"] VERBOSE: Found localized configuration for 'de' ```
|
Sorry this is causing you trouble. I haven't been able to reproduce that exact setup, it uses the german localization for me with Do you mind filing a separate GitHub issue and providing more details to help us look into it? Specifically wondering what iOS version you're using. I've also sent #3649 which adds some verbose logs to help us diagnose it. Would you be able to run the app using that branch? Make sure you set Thanks 👍🏻 |
Will make debugging issues like #3633 and #3633 (comment) easier. ``` VERBOSE: Looking up localized configuration for ["de_CH", "de"] VERBOSE: Found localized configuration for 'de' ```
Added #3655. To your specific question, I'm using the latest iOS 17.2.1. In the Simulator, this happens on iOS 17.x and 16.x, but not 15.x. |
Fixes #3655. Follow up to #3633. This improves upon that PR by using `Locale.current.removingRegion` **before** trying to look up `Locale.preferredLocales`. This fixes this scenario: - Configure your phone with: `en_UK` and `es_ES` - Launch paywall with localization `en_US` and `es_ES` Prior to this change, we'd be looking up localizations in this order: - `en_UK` - `es_ES` - `en` (no region) Because there _is_ a localization for `es_ES` we'd return that one before attempting to look up `Locale.current.removingRegion`.
#3657) Fixes #3655. Follow up to #3633. This improves upon that PR by using `Locale.current.removingRegion` for each locale **before** trying to look up `Locale.preferredLocales`. This fixes this scenario: - Configure your phone with: `en_IN` and `es_ES` - Launch paywall with localization `en_US` and `es_ES` Prior to this change, we'd be looking up localizations in this order: - `en_IN` - `es_ES` - `en` (no region) Because there _is_ a localization for `es_ES` we'd return that one before attempting to look up `Locale.current.removingRegion`. Example of the new log: > VERBOSE: Looking up localized configuration for ["en_IN", "es_ES"], searching for ["en_IN", "en", "es_ES", "es"] > VERBOSE: Found localized configuration for 'en'
This was a regression introduced by #3605.
Example:
Consider a paywall configuration with these locales:
en_US,de_DE.Running on a device with locale
en_INfor example.Before #3605,
PaywallData.localizedConfigurationwould have returned theen_USlocalization. However, that change made it so that it could no longer find a matching localization with a different region.This fix improves the locale lookup so that if it doesn't find a matching localization with both language AND region, it then tries to look it up with only the language, before falling back to the default localization.