From 3a651fa9fd1778fb80ce8f1d6b4a712bc3801610 Mon Sep 17 00:00:00 2001 From: Chris Garrity Date: Fri, 10 May 2019 08:01:59 -0400 Subject: [PATCH] Fix translations script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don’t overwrite the english defaults from the local `l10n.json` source files with ‘en’ downloaded from transifex. --- bin/build-locales | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/build-locales b/bin/build-locales index 0c2c20d4d..6ff1553c7 100755 --- a/bin/build-locales +++ b/bin/build-locales @@ -106,7 +106,9 @@ for ( var l in languages ) { l + '.json' ); fs.accessSync(langTranslations); - generalLocales[l] = JSON.parse(fs.readFileSync(langTranslations, 'utf8')); + if (l !== 'en') { + generalLocales[l] = JSON.parse(fs.readFileSync(langTranslations, 'utf8')); + } } catch (err) { // just use english generalLocales[l] = generalLocales['en']; @@ -228,8 +230,11 @@ async.forEachLimit(views, 5, function (view, cb) { } } try { - viewLocales[isoCode] = merge({}, generalLocales[isoCode], JSON.parse(data)); - defaults(viewLocales[isoCode], viewLocales['en']); + // don't overwrite english view strings + if (isoCode !== 'en') { + viewLocales[isoCode] = merge({}, generalLocales[isoCode], JSON.parse(data)); + defaults(viewLocales[isoCode], viewLocales['en']); + } } catch (e) { return cb(e); }