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

fixed #4062, fixed akhoury/nodebb-plugin-emailer-mandrill#19

Browse Source
This commit is contained in:
Julian Lam
2016-01-15 10:09:02 -05:00
parent a63c91de3b
commit 4357c2ef4e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins.js
View File

@@ -31,6 +31,7 @@ var fs = require('fs'),
Plugins.lessFiles = [];
Plugins.clientScripts = [];
Plugins.customLanguages = [];
Plugins.customLanguageFallbacks = {};
Plugins.libraryPaths = [];
Plugins.versionWarning = [];
@@ -393,12 +394,10 @@ var fs = require('fs'),
translator.addTranslation(language, filename, lang.file);
});
var fallbackPath;
for(var resource in Plugins.customLanguageFallbacks) {
fallbackPath = Plugins.customLanguageFallbacks[resource];
params.router.get('/language/:lang/' + resource + '.json', function(req, res, next) {
winston.verbose('[translator] No resource file found for ' + req.params.lang + '/' + resource + ', using provided fallback language file');
res.sendFile(fallbackPath);
winston.verbose('[translator] No resource file found for ' + req.params.lang + '/' + path.basename(req.path, '.json') + ', using provided fallback language file');
res.sendFile(Plugins.customLanguageFallbacks[path.basename(req.path, '.json')]);
});
}

5
src/plugins/load.js
View File

@@ -6,6 +6,7 @@ var fs = require('fs'),
async = require('async'),
winston = require('winston'),
nconf = require('nconf'),
_ = require('underscore'),
file = require('../file'),
utils = require('../../public/src/utils');
@@ -184,7 +185,7 @@ module.exports = function(Plugins) {
route: pathToLang.replace(pathToFolder, '')
});
if (pluginData.defaultLang) {
if (pluginData.defaultLang && pathToLang.endsWith(pluginData.defaultLang + '/' + path.basename(pathToLang))) {
fallbackMap[path.basename(pathToLang, '.json')] = path.join(pathToFolder, pluginData.defaultLang, path.basename(pathToLang));
}
@@ -196,7 +197,7 @@ module.exports = function(Plugins) {
}
Plugins.customLanguages = Plugins.customLanguages.concat(arr);
Plugins.customLanguageFallbacks = fallbackMap;
_.extendOwn(Plugins.customLanguageFallbacks, fallbackMap);
callback();
});