This repository has been archived by the owner on Jul 30, 2018. It is now read-only.
Allow widget i18n bundles to be overridden #902
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
jcfranco
reviewed
Apr 12, 2018
README.md
Outdated
| w(WidgetA, { | ||
| i18nBundle: overrideBundleForWidgetA | ||
| }), | ||
| w(WidgetB) { |
mwistrand
force-pushed
the
901-override-bundles
branch
from
a14e393 to
70ec826
Compare
agubler
reviewed
Apr 30, 2018
tests/unit/mixins/I18n.ts
Outdated
| @@ -119,6 +135,62 @@ registerSuite('mixins/I18nMixin', { | |||
| }); | |||
| } | |||
| }, | |||
| '.localizeBundle() with an override': { | |||
| 'Uses the `i18nBundle` property'(this: any) { | |||
| const dfd = this.async(); | |||
There was a problem hiding this comment.
How come we are using this.async here and not dealing with promises as with other async tests in widget-core? It would be super if we didn't need to use a setTimeout also.
There was a problem hiding this comment.
This was originally needed to workaround the fact that localizeBundle asynchronously loads locale-specific messages but synchronously returns either the default messages or the cached messages. However, the underlying functionality has changed between commits, so I should be able to just use @dojo/i18n/i18n.default() directly.
Add an `overrideBundle` property to the `I18n` mixin properties allowing the base bundle to be overridden, or specific bundles to be overridden in the event that a widget derives its messages from multiple bundles.
Rename `overrideBundle` to `i18nBundle` and require the property to be a full bundle or map of bundles.
mwistrand
force-pushed
the
901-override-bundles
branch
from
eeb87ef to
ebd1695
Compare
matt-gadd
approved these changes
May 1, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Type: feature
The following has been addressed in the PR:
prettieras per the readme code style guidelinesDescription:
Add an
overrideBundleproperty to theI18nmixin properties allowing the base bundle to be overridden, or specific bundles to be overridden in the event that a widget derives its messages from multiple bundles.overrideBundlecan a complete bundle, an object with alocalesloader object that will be merged with the widget's default bundle, or aMapof default bundles to override values.Resolves #901