Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-26 23:35:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

closes #2015

Browse Source
This commit is contained in:
barisusakli
2014-09-01 14:09:47 -04:00
parent a252bf409c
commit ae6d5e72f4
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/controllers/api.js
View File

@@ -42,6 +42,7 @@ apiController.getConfig = function(req, res, next) {
config.maximumFileSize = meta.config.maximumFileSize;
config['theme:id'] = meta.config['theme:id'];
config.defaultLang = meta.config.defaultLang || 'en_GB';
config.userLang = config.defaultLang;
config.environment = process.env.NODE_ENV;
config.loggedIn = !!req.user;
config['cache-buster'] = meta.config['cache-buster'] || '';
@@ -68,7 +69,7 @@ apiController.getConfig = function(req, res, next) {
config.topicsPerPage = settings.topicsPerPage;
config.postsPerPage = settings.postsPerPage;
config.notificationSounds = settings.notificationSounds;
config.defaultLang = settings.language || config.defaultLang;
config.userLang = settings.language || config.defaultLang;
config.openOutgoingLinksInNewTab = settings.openOutgoingLinksInNewTab;
config.topicPostSort = settings.topicPostSort || config.topicPostSort;

2
src/middleware/middleware.js
View File

@@ -396,7 +396,7 @@ middleware.processRender = function(req, res, next) {
middleware.renderHeader(req, res, function(err, template) {
str = template + str;
translator.translate(str, res.locals.config.defaultLang, function(translated) {
translator.translate(str, res.locals.config.userLang, function(translated) {
fn(err, translated);
});
});