Fix sync nls bundles for supported locales

dojo · Mar 18, 2020 · 7e93092 · 7e93092
1 parent 4d03fae
commit 7e93092
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/i18n/i18n.ts b/src/i18n/i18n.ts
@@ -315,7 +315,9 @@ function registerBundle<T extends Messages>(bundle: Bundle<T>): string {
 				messages = bundleLoader;
 			}
 			if (isSupportedLocale) {
-				messageBundles[locale] = messages;
+				messageBundles[locale] = {
+					[bundleId]: messages
+				};
 			} else if (lookup[locale]) {
 				lookup[locale].bundles = { [bundleId]: messages };
 			} else {
@@ -361,7 +363,7 @@ export function localizeBundle<T extends Messages>(
 		return getPlaceholderBundle(bundle);
 	}
 	const bundleId = registerBundle(bundle);
-	const globalize = globalizeInstanceMap.get(locale) || new Globalize(locale);
+	const globalize = globalizeInstanceMap.get(locale) || new Globalize(new Cldr(locale));
 	globalizeInstanceMap.set(locale, globalize);
 	const lookupId = globalize.cldr.get(`${DOJO_PATH}/${bundleId}/id`);
 	const lookupLocale = globalize.cldr.get(`${DOJO_PATH}/${bundleId}/locale`);

diff --git a/tests/i18n/unit/i18n.ts b/tests/i18n/unit/i18n.ts
@@ -96,6 +96,7 @@ describe('i18n', () => {
 			setCldrLoaders({
 				fallback: fallback.loader
 			});
+			setSupportedLocales(['fr', 'ja']);
 			const invalidator = stub();
 			const bundle = {
 				messages: { foo: 'bonjour, {name}', fallback: 'root/fr fallback' },