scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #2969 from benjiwheeler/make-translations

Browse source 
fix "make translations" command
This commit is contained in:
Benjamin Wheeler 2019-05-13 17:08:23 -04:00 committed by GitHub
commit b2d5bbcb93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bin/build-locales
View file

@ -106,7 +106,9 @@ for ( var l in languages ) {
l + '.json' l + '.json'
); );
fs.accessSync(langTranslations); fs.accessSync(langTranslations);
if (l !== 'en') {
generalLocales[l] = JSON.parse(fs.readFileSync(langTranslations, 'utf8')); generalLocales[l] = JSON.parse(fs.readFileSync(langTranslations, 'utf8'));
}
} catch (err) { } catch (err) {
// just use english // just use english
generalLocales[l] = generalLocales['en']; generalLocales[l] = generalLocales['en'];
@ -228,8 +230,11 @@ async.forEachLimit(views, 5, function (view, cb) {
} }
} }
try { try {
// don't overwrite english view strings
if (isoCode !== 'en') {
viewLocales[isoCode] = merge({}, generalLocales[isoCode], JSON.parse(data)); viewLocales[isoCode] = merge({}, generalLocales[isoCode], JSON.parse(data));
defaults(viewLocales[isoCode], viewLocales['en']); defaults(viewLocales[isoCode], viewLocales['en']);
}
} catch (e) { } catch (e) {
return cb(e); return cb(e);
} }