fix(framework): Allow users to override default language translations (#1716)

Author: vladitasev

packages/base/src/asset-registries/i18n.js

@@ -28,7 +28,8 @@ const getI18nBundleData = packageName => {
  * @public
  */
 const registerI18nBundle = (packageName, bundle) => {
-	bundleURLs.set(packageName, bundle);
+	const oldBundle = bundleURLs.get(packageName) || {};
+	bundleURLs.set(packageName, Object.assign({}, oldBundle, bundle));
 };
 
 /**
@@ -52,11 +53,11 @@ const fetchI18nBundle = async packageName => {
 	const language = getLocale().getLanguage();
 
 	let localeId = normalizeLocale(language);
-	while (!bundlesForPackage[localeId]) {
+	while (localeId !== DEFAULT_LANGUAGE && !bundlesForPackage[localeId]) {
 		localeId = nextFallbackLocale(localeId);
 	}
 
-	if (localeId === DEFAULT_LANGUAGE) {
+	if (!bundlesForPackage[localeId]) {
 		return;
 	}
 

packages/tools/lib/generate-json-imports/i18n.js

@@ -1,18 +1,21 @@
 const fs = require("fs");
 const path = require('path');
 const mkdirp = require("mkdirp");
+const assets = require("../../assets-meta.js");
 
 const packageName = JSON.parse(fs.readFileSync("package.json")).name;
 
 const inputFolder = path.normalize(process.argv[2]);
 const outputFile = path.normalize(`${process.argv[3]}/i18n.js`);
 
+const defaultLanguage = assets.languages.default;
+
 // All languages present in the file system
 const files = fs.readdirSync(inputFolder);
 const languages = files.map(file => {
   const matches = file.match(/messagebundle_(.+?).json$/);
   return matches ? matches[1] : undefined;
-}).filter(key => !!key);
+}).filter(key => !!key && key !== defaultLanguage);
 
 let content;