Paywalls: prioritize Locale.current over Locale.preferredLocales
#3657
Conversation
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`.
|
This looks like it will likely fix my issue #3655. But I think an optimal solution would be to add the removingRegion for EACH locale in the list, and try it right after the full locale is attempted. So [de-CH, en-UK, it-IT] becomes [de-CH, de, en-UK, en, it-IT, it]. That way, if you had a US English and an Italian localization, it would pick up the English one in the above example based on the UK English preference. |
|
That makes sense, I'll make that change 👍🏻 |
|
Awesome. Thanks for you work on this @NachoSoto. Just curious if this will go into a 4.x release of the library. I'm literally waiting on this fix to release my app in Switzerland imminently, and will migrate to 5.x later. Otherwise I'll plan to fork and release on a fork that includes this fix. |
|
@samkass updated. We'll release this on the next 4.x release this week 👍🏻 |
| } | ||
|
|
||
| return result | ||
| return [.current] + Locale.preferredLocales |
There was a problem hiding this comment.
This goes back to the original implementation. It allows us to test the actual behavior in localizedConfiguration since it no longer relies on this returning the .removingRegion addition.
| 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] |
**This is an automatic release.** ### RevenueCatUI * `Paywalls`: prioritize `Locale.current` over `Locale.preferredLocales` (#3657) via NachoSoto (@NachoSoto) * `Paywalls`: add logs for localization lookup (#3649) via NachoSoto (@NachoSoto) ### Dependency Updates * Bump cocoapods from 1.15.1 to 1.15.2 (#3648) via dependabot[bot] (@dependabot[bot]) ### Other Changes * `Tests`: fix iOS 15 test crash (#3650) via NachoSoto (@NachoSoto) * `CircleCI`: remove duplicate `install-dependencies` (#3643) via NachoSoto (@NachoSoto)
Fixes #3655.
Follow up to #3633.
This improves upon that PR by using
Locale.current.removingRegionfor each locale before trying to look upLocale.preferredLocales.This fixes this scenario:
en_INandes_ESen_USandes_ESPrior to this change, we'd be looking up localizations in this order:
en_INes_ESen(no region)Because there is a localization for
es_ESwe'd return that one before attempting to look upLocale.current.removingRegion.Example of the new log: