That's what i like about JS.

This commit is contained in:
vale981 2017-09-21 16:48:37 +02:00 committed by GitHub
parent 047f29c55b
commit 10b36ec942

View file

@ -86,14 +86,17 @@ Multilang.prototype.getPlugin = function () {
if (base !== file) { if (base !== file) {
if(files[base] && files[file]){ if(files[base] && files[file]){
var contents = files[file].contents; var contents = files[file].contents;
files[file] = deepmerge(files[base], files[file], {clone:true}); delete files[file].contents;
files[file] = deepmerge(files[base], files[file]);
files[file].contents = contents; files[file].contents = contents;
} }
} }
} else { } else {
files[file].locale = self.default; files[file].locale = self.default;
} }
}
for (var file in files) {
// Generate altFiles map // Generate altFiles map
files[file].altFiles = {}; files[file].altFiles = {};
@ -116,13 +119,15 @@ Multilang.prototype.getPlugin = function () {
for (file of Object.keys(files)) { for (file of Object.keys(files)) {
if (files[file].index) { if (files[file].index) {
var name = file.replace(this.pattern, ''); var name = file.replace(this.pattern, '');
name = name.substr(name.lastIndexOf('/') + 1);
if (files[file].locale === self.default) { if (files[file].locale === self.default) {
files[file].path = ''; files[file].path = '';
name = name.substr(name.lastIndexOf('/') + 1);1 files[name] = files[file];
files[name] = Object.assign({},files[file]);
} else { } else {
files[file].path = files[file].locale +'/'; files[file].path = files[file].locale +'/';
files[files[file].locale + '/' + name] = files[file]; name = files[file].locale + '/' + name;
files[name] = files[file];
} }
// Remove old entry // Remove old entry