From 99e50150835c62720cd8d5ce859d2cbb37275f48 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 6 Oct 2015 06:13:25 -0400
Subject: [PATCH] closes #3690

---
 public/src/client/register.js     | 10 ++++++++++
 src/controllers/authentication.js |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/public/src/client/register.js b/public/src/client/register.js
index 25d76a73fe..099b31c087 100644
--- a/public/src/client/register.js
+++ b/public/src/client/register.js
@@ -16,6 +16,8 @@ define('forum/register', ['csrf', 'translator'], function(csrf, translator) {
 			register = $('#register'),
 			agreeTerms = $('#agree-terms');
 
+		handleLanguageOverride();
+
 		$('#referrer').val(app.previousUrl);
 
 		email.on('blur', function() {
@@ -223,6 +225,14 @@ define('forum/register', ['csrf', 'translator'], function(csrf, translator) {
 		});
 	}
 
+	function handleLanguageOverride() {
+		if (!app.user.uid && config.defaultLang !== config.userLang) {
+			var formEl = $('[component="register/local"]'),
+				langEl = $('<input type="hidden" name="userLang" value="' + config.userLang + '" />');
+
+			formEl.append(langEl);
+		}
+	}
 
 	return Register;
 });
diff --git a/src/controllers/authentication.js b/src/controllers/authentication.js
index 043776eda2..686a9d2717 100644
--- a/src/controllers/authentication.js
+++ b/src/controllers/authentication.js
@@ -69,6 +69,10 @@ authenticationController.register = function(req, res, next) {
 			return res.status(400).send(err.message);
 		}
 
+		if (req.body.userLang) {
+			user.setSetting(data.uid, 'userLang', req.body.userLang);
+		}
+
 		res.json(data);
 	});
 };