Node.js based forum software built for the modern web
fix: fall back to en-GB for untranslated strings (#14829)
Elias Hackradt3f3f85ccbcee
diff --git a/src/meta/languages.js b/src/meta/languages.jsindex 1fc36c4aca..a68bd822d1 100644--- a/src/meta/languages.js+++ b/src/meta/languages.js@@ -85,8 +85,11 @@ async function buildTranslations(ref) {async function buildNamespaceLanguage(lang, namespace, plugins) {const translations = {};- // core first- await assignFileToTranslations(translations, path.join(coreLanguagesPath, lang, `${namespace}.json`));+ // core first, en-GB fills keys that are missing or untranslated in lang+ await assignFileToTranslations(translations, path.join(coreLanguagesPath, 'en-GB', `${namespace}.json`));+ if (lang !== 'en-GB') {+ await assignFileToTranslations(translations, path.join(coreLanguagesPath, lang, `${namespace}.json`));+ }await Promise.all(plugins.map(pluginData => addPlugin(translations, pluginData, lang, namespace)));@@ -130,7 +133,9 @@ async function addPlugin(translations, pluginData, lang, namespace) {async function assignFileToTranslations(translations, path) {try {const fileData = await fs.promises.readFile(path, 'utf8');- Object.assign(translations, JSON.parse(fileData));+ // Transifex exports untranslated strings as "", which must not override a fallback+ const entries = Object.entries(JSON.parse(fileData)).filter(([, value]) => value !== '');+ Object.assign(translations, Object.fromEntries(entries));} catch (err) {if (err.code !== 'ENOENT') {throw err;