From 954c25823e34c1c70b2ef592c07fc01952e427b5 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 22 Jul 2015 14:17:29 -0400
Subject: [PATCH] closes #3352

---
 public/src/modules/translator.js | 2 +-
 src/controllers/api.js           | 4 ++--
 src/middleware/middleware.js     | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/src/modules/translator.js b/public/src/modules/translator.js
index 4569fb0d5b..42efe5c529 100644
--- a/public/src/modules/translator.js
+++ b/public/src/modules/translator.js
@@ -125,7 +125,7 @@
 		if (typeof language === 'function') {
 			callback = language;
 			if ('undefined' !== typeof window && config) {
-				language = config.userLang || 'en_GB';
+				language = utils.params().lang || config.userLang || 'en_GB';
 			} else {
 				var meta = require('../../../src/meta');
 				language = meta.config.defaultLang || 'en_GB';
diff --git a/src/controllers/api.js b/src/controllers/api.js
index 5518addd45..c09a96490d 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -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;
diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js
index 0c4cca5e3e..05ba06e69b 100644
--- a/src/middleware/middleware.js
+++ b/src/middleware/middleware.js
@@ -347,6 +347,7 @@ middleware.processRender = function(req, res, next) {
 					}
 					str = template + str;
 					var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB';
+					language = req.query.lang || language;
 					translator.translate(str, language, function(translated) {
 						fn(err, translated);
 					});