scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-03-22 19:05:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions2

Merge pull request from mewtaylor/issue/gh-1303

Browse source 
Fix GH-1303: Apply english strings as defaults for views during builds
This commit is contained in:
Matthew Taylor 2017-05-16 16:08:49 -04:00 committed by GitHub
commit 30bd5e435d
1 changed files with 5 additions and 3 deletions

8
bin/build-locales
View file

@ -32,12 +32,13 @@
}
'''
*/
var fs = require('fs');
var path = require('path');
var merge = require('lodash.merge');
var async = require('async');
var fs = require('fs');
var languages = require('../languages.json');
var localizedUrls = require('./lib/localized-urls');
var merge = require('lodash.merge');
var defaults = require('lodash.defaults');
var path = require('path');
var routes = require('../src/routes.json');
// -----------------------------------------------------------------------------
@ -215,6 +216,7 @@ async.forEachLimit(views, 5, function (view, cb) {
}
try {
viewLocales[isoCode] = merge({}, generalLocales[isoCode], JSON.parse(data));
defaults(viewLocales[isoCode], viewLocales['en']);
} catch (e) {
return cb(e);
}