fix(framework): Take region into account for i18n assets (#1985)

vladitasev · vladitasev · commit a75c96d3e7d0 · 2020-07-28T09:13:30.000+03:00
diff --git a/packages/base/src/asset-registries/i18n.js b/packages/base/src/asset-registries/i18n.js
@@ -56,8 +56,9 @@ const fetchI18nBundle = async packageName => {
 	}
 
 	const language = getLocale().getLanguage();
+	const region = getLocale().getRegion();
 
-	let localeId = normalizeLocale(language);
+	let localeId = normalizeLocale(language + (region ? `-${region}` : ``));
 	while (localeId !== DEFAULT_LANGUAGE && !bundlesForPackage[localeId]) {
 		localeId = nextFallbackLocale(localeId);
 	}

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,9 @@ const fetchI18nBundle = async packageName => {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`const language = getLocale().getLanguage();`
	`59`	`+ const region = getLocale().getRegion();`
`59`	`60`
`60`		`- let localeId = normalizeLocale(language);`
	`61`	+ let localeId = normalizeLocale(language + (region ? `-${region}` : ``));
`61`	`62`	`while (localeId !== DEFAULT_LANGUAGE && !bundlesForPackage[localeId]) {`
`62`	`63`	`localeId = nextFallbackLocale(localeId);`
`63`	`64`	`}`