CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-17 22:24:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix lodash merge

Browse Source
This commit is contained in:
Kushan Joshi
2017-09-28 17:32:55 +05:30
parent 6e3795bfd8
commit 84fd3d7d16
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_data.js
+2 -2
View File
@@ -178,7 +178,7 @@ function suggestionsToPresets(presets) {
delete existing[name];
}
if (!existing[name]) {
tags = _.extend({name: name.replace(/"/g, '')}, suggestions[key][value][name].tags);
tags = _extend({name: name.replace(/"/g, '')}, suggestions[key][value][name].tags);
addSuggestion(item, tags, name.replace(/"/g, ''), count);
}
}
@@ -380,7 +380,7 @@ function writeEnJson(tstrings) {
return Promise.all([readCoreYaml, readImagery]).then(function(data) {
var core = YAML.load(data[0]);
var imagery = YAML.load(data[1]);
var en = _.merge(core, { en: { presets: tstrings } }, imagery);
var en = _merge(core, { en: { presets: tstrings } }, imagery);
return writeFileProm(
'dist/locales/en.json',
JSON.stringify(en, null, 4)