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

still iterate over languages for views without l10n

Browse source 
Fixes #1199 by continuing the iteration over languages even if a view doesn’t have an l10n file. The issue was that only the `en` language object was getting added when the view didn’t have an l10n file, because of the `hasOwnProperty` check. This adjusts it to iterate over languages anyways, and only ouput the `No translations for…` message if it’s for a language of a view that does have an l10n file.
This commit is contained in:
Matthew Taylor 2017-03-13 10:00:30 -04:00
parent 5634e993e9
commit 5ca880d16a
1 changed files with 28 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
bin/build-locales
View file

@ -189,48 +189,39 @@ async.forEachLimit(views, 5, function (view, cb) {
var viewLocales = {};
viewLocales['en'] = merge({}, generalLocales['en'], defaultLocales[view]);
if ( defaultLocales.hasOwnProperty(view) ) {
// merge view specific english strings, first then other languages
process.stdout.write('Merging translations for ' + view + '\n');
async.forEach(allLangs, function (isoCode, cb) {
var translationsFile = path.resolve(
__dirname,
'../',
localesDir,
'scratch-website.' + view + '-l10njson',
isoCode + '.json'
);
fs.readFile(translationsFile, 'utf8', function (err, data) {
if (err) {
if (err.code === 'ENOENT') {
if (isoCode !== 'en') {
// merge view specific english strings, first then other languages
process.stdout.write('Merging translations for ' + view + '\n');
async.forEach(allLangs, function (isoCode, cb) {
var translationsFile = path.resolve(
__dirname,
'../',
localesDir,
'scratch-website.' + view + '-l10njson',
isoCode + '.json'
);
fs.readFile(translationsFile, 'utf8', function (err, data) {
if (err) {
if (err.code === 'ENOENT') {
if (isoCode !== 'en') {
if (defaultLocales.hasOwnProperty(view)) {
process.stdout.write('No translations for ' + view + isoCode + ', using english\n');
viewLocales[isoCode] = merge({}, generalLocales[isoCode], defaultLocales[view]);
}
return cb();
} else {
return cb(err);
viewLocales[isoCode] = merge({}, generalLocales[isoCode], defaultLocales[view]);
}
}
try {
viewLocales[isoCode] = merge({}, generalLocales[isoCode], JSON.parse(data));
} catch (e) {
return cb(e);
}
cb();
});
}, function (err) {
if (err) process.stdout.write('Error merging translations for view: ' + view + '\n' + err + '\n');
var viewTranslations = merge({}, viewLocales, localizedAssetUrls[view]);
writeIntlFile(outputDir, view, viewTranslations, function (err) {
if (err) {
process.stdout.write('Failed to save: ' + view + '\n');
return cb();
} else {
return cb(err);
}
});
}
try {
viewLocales[isoCode] = merge({}, generalLocales[isoCode], JSON.parse(data));
} catch (e) {
return cb(e);
}
cb();
});
} else {
}, function (err) {
if (err) process.stdout.write('Error merging translations for view: ' + view + '\n' + err + '\n');
var viewTranslations = merge({}, viewLocales, localizedAssetUrls[view]);
writeIntlFile(outputDir, view, viewTranslations, function (err) {
if (err) {
@ -238,7 +229,7 @@ async.forEachLimit(views, 5, function (view, cb) {
return cb(err);
}
});
}
});
cb();
}, function (err) {
if (err) {