Clean up locale fallback code #101
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
movermeyer
force-pushed
the
movermeyer/fix_fallbacks
branch
3 times, most recently
from
53f8ae2 to
9eb64d5
Compare
It was breaking on locales with more than two segments (e.g., `zh-Hant-HK`) Beyond that, I pulled out the fallback code and exposed it so that downstream consumers can use it too. I structured it in a similar manner as `ruby-i18n`'s [`I18n::Locale::Fallbacks`](https://github.com/ruby-i18n/i18n/blob/535459ad1201e7cc97a071bd5d9f0e1d5406069e/lib/i18n/locale/fallbacks.rb). I also changed the keys and values in `ParentLocales` to be symbols, which simplifies the code. It's still not fully correct for locales that contain scripts (e.g., `ff-Adlm-GH`). That will be a different commit.
movermeyer
force-pushed
the
movermeyer/fix_fallbacks
branch
from
9eb64d5 to
17e858c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What are you trying to accomplish?
Locales with more than two segments (e.g.,
zh-Hant-HK) were getting an incorrect fallback chain.What approach did you choose and why?
I changed the code to use
parents.firstinstead ofself_and_parents.last.Beyond that, I pulled out the fallback code into its own file, and structured it in a similar fashion as
ruby-i18n'sI18n::Locale::Fallbacks.I also changed the keys and values in
ParentLocalesto be symbols, which simplifies the code (less conversions).What should reviewers focus on?
It's still not fully correct for locales that contain scripts (e.g.,
ff-Adlm-GH), see #103.But that will be a separate PR.
The impact of these changes
Fixes #102
Testing
...