This commit is contained in:
barisusakli
2015-07-22 14:17:29 -04:00
parent c38cab3b74
commit 954c25823e
3 changed files with 4 additions and 3 deletions

View File

@@ -64,7 +64,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.userLang = req.query.lang || config.defaultLang;
config.environment = process.env.NODE_ENV;
config.loggedIn = !!req.user;
config['cache-buster'] = meta.config['cache-buster'] || '';
@@ -89,7 +89,7 @@ apiController.getConfig = function(req, res, next) {
config.topicsPerPage = settings.topicsPerPage;
config.postsPerPage = settings.postsPerPage;
config.notificationSounds = settings.notificationSounds;
config.userLang = settings.userLang || config.defaultLang;
config.userLang = req.query.lang || settings.userLang || config.defaultLang;
config.openOutgoingLinksInNewTab = settings.openOutgoingLinksInNewTab;
config.topicPostSort = settings.topicPostSort || config.topicPostSort;
config.categoryTopicSort = settings.categoryTopicSort || config.categoryTopicSort;