Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-21 23:12:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4982

Browse Source
This commit is contained in:
Julian Lam
2016-09-02 09:39:13 -04:00
parent 416186a2b6
commit bb80dc360e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/modules/translator.js
View File

@@ -313,8 +313,10 @@
callback(data);
};
if (err) {
winston.error('[translator] Could not load `' + filename + '`: ' + err.message + '. Skipping...');
if (err && err.code === 'ENOENT') {
data = {};
} else if (err) {
winston.error('[translator] Error while loading language file: ' + err.message);
return callback({});
}

4
src/plugins/load.js
View File

@@ -253,7 +253,6 @@ module.exports = function(Plugins) {
}).filter(Boolean).forEach(function(key) {
Plugins.customLanguages[key] = _.defaults(Plugins.customLanguages[key] || {}, data);
});
fallbackMap[path.basename(pathToLang, '.json')] = path.join(pathToFolder, pluginData.defaultLang, path.basename(pathToLang));
}
next();
@@ -263,9 +262,6 @@ module.exports = function(Plugins) {
return callback(err);
}
// do I need this either?
_.extendOwn(Plugins.customLanguageFallbacks, fallbackMap);
callback();
});
});