Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-29 10:06:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-01-20 12:33:17 -05:00
parent 76376f52c3 694f2382bf
commit 73879b824c
18 changed files with 290 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/middleware/index.js
View File

@@ -207,23 +207,6 @@ middleware.applyBlacklist = function (req, res, next) {
});
};
middleware.getTranslation = function (req, res, next) {
var language = req.params.language;
var namespace = req.params[0];
if (language && namespace) {
languages.get(language, namespace, function (err, translations) {
if (err) {
return next(err);
}
res.status(200).json(translations);
});
} else {
res.status(404).json('{}');
}
};
middleware.processTimeagoLocales = function (req, res, next) {
var fallback = req.path.indexOf('-short') === -1 ? 'jquery.timeago.en.js' : 'jquery.timeago.en-short.js',
localPath = path.join(__dirname, '../../public/vendor/jquery/timeago/locales', req.path),