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

vladitasev · web-flow · commit 3b614ad5cab9 · 2020-07-27T10:31:07.000+03:00
diff --git a/packages/base/src/asset-registries/i18n.js b/packages/base/src/asset-registries/i18n.js
@@ -57,8 +57,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
`@@ -57,8 +57,9 @@ const fetchI18nBundle = async packageName => {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`const language = getLocale().getLanguage();`
	`60`	`+ const region = getLocale().getRegion();`
`60`	`61`
`61`		`- let localeId = normalizeLocale(language);`
	`62`	+ let localeId = normalizeLocale(language + (region ? `-${region}` : ``));
`62`	`63`	`while (localeId !== DEFAULT_LANGUAGE && !bundlesForPackage[localeId]) {`
`63`	`64`	`localeId = nextFallbackLocale(localeId);`
`64`	`65`	`}`