Incremental and hierarchical fallback#39
Open
cdjackson wants to merge 9 commits intodoshprompt:masterfrom
Open
Incremental and hierarchical fallback#39cdjackson wants to merge 9 commits intodoshprompt:masterfrom
cdjackson wants to merge 9 commits intodoshprompt:masterfrom
Conversation
This adds the locale name to the array, thus allowing the same array to be used as input to user locale selection, or feedback.
This allows three levels of fallback. The requested locale, falling back to the fallback locale and then the default. This allows incremental localisation files, so, for example, you can have de-CH as a swiss localisisation, overiding de-DE for the main German localisation, and then the fallback of en-US for anything not in these files.
…zation into local-fallback Conflicts: dist/angular-localization.js dist/angular-localization.min.js dist/angular-localization.min.js.gz dist/angular-localization.min.map src/localization.js
The path into deference object needs to include the locale to ensure all promises are resolved.
Author
|
I've updated this PR to merge your latest changes and resolve the conflicts. I've also fixed a small bug in the fallback routine associated with resolving all the promises as the deferred path previously didn't include the locale which meant that resolving the promise didn't work correctly. I've also fixed the fallback tests and added some new test cases. |
|
+1 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This supports three levels of fallback. The requested locale, falling back to the fallback locale and then the default. This allows incremental localisation files, so, for example, you can have de-CH as a swiss localisation with just a few Swiss phrases, over-riding de-DE for the main German language localisation, and then the fallback of en-US for anything not in these files.
This builds the hierarchical locale list in the
setLocalemethod then it loads all files when they are first requested to avoid any issues later.This PR also includes #38 which adds locale names to the configuration list.
(#30)