From 10b36ec942707ec402cac064070f01fe16ec42fb Mon Sep 17 00:00:00 2001 From: vale981 Date: Thu, 21 Sep 2017 16:48:37 +0200 Subject: [PATCH] That's what i like about JS. --- lib/multilang.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/multilang.js b/lib/multilang.js index 0de6e03..743b698 100644 --- a/lib/multilang.js +++ b/lib/multilang.js @@ -86,14 +86,17 @@ Multilang.prototype.getPlugin = function () { if (base !== file) { if(files[base] && files[file]){ 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; } } } else { files[file].locale = self.default; } + } + for (var file in files) { // Generate altFiles map files[file].altFiles = {}; @@ -116,18 +119,20 @@ Multilang.prototype.getPlugin = function () { for (file of Object.keys(files)) { if (files[file].index) { var name = file.replace(this.pattern, ''); + name = name.substr(name.lastIndexOf('/') + 1); + if (files[file].locale === self.default) { files[file].path = ''; - name = name.substr(name.lastIndexOf('/') + 1);1 - files[name] = Object.assign({},files[file]); + files[name] = files[file]; } else { 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 if(name !== file) - delete files[file]; + delete files[file]; } }