mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2024-11-27 01:25:52 -05:00
Merge pull request #2969 from benjiwheeler/make-translations
fix "make translations" command
This commit is contained in:
commit
b2d5bbcb93
1 changed files with 9 additions and 4 deletions
|
@ -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'];
|
||||
|
@ -128,7 +130,7 @@ var localizedAssetUrls = {};
|
|||
// - the route name
|
||||
// - the transifex resource
|
||||
// Add exceptions:
|
||||
// - txMapping: if the name of the transifex resource is different from the route name
|
||||
// - txMapping: if the name of the transifex resource is different from the route name
|
||||
var txMapping = {
|
||||
'projects': 'preview',
|
||||
'scratch_1.4': 'scratch_14' // transifex doesn't allow dots in resource names
|
||||
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue