closes #1013

lets user change languages,

src/controllers/accounts.js

@@ -15,6 +15,7 @@ var fs = require('fs'),
 	utils = require('./../../public/src/utils'),
 	meta = require('./../meta'),
 	plugins = require('./../plugins'),
+	languages = require('./../languages'),
 	image = require('./../image'),
 	file = require('./../file');
 
@@ -331,22 +332,29 @@ accountsController.accountSettings = function(req, res, next) {
 				return next(err);
 			}
 
-			user.getUserFields(uid, ['username', 'userslug'], function(err, userData) {
+			async.parallel({
+				user: function(next) {
+					user.getUserFields(uid, ['username', 'userslug'], next);
+				},
+				languages: function(next) {
+					languages.list(next);
+				}
+			}, function(err, results) {
 				if (err) {
 					return next(err);
 				}
 
-				if(!userData) {
+				if(!results.user) {
 					return userNotFound();
 				}
-				userData.yourid = req.user.uid;
-				userData.theirid = uid;
-				userData.settings = settings;
 
-				res.render('accountsettings', userData);
+				results.user.yourid = req.user.uid;
+				results.user.theirid = uid;
+				results.user.settings = settings;
+
+				res.render('accountsettings', results);
 			});
 		});
-
 	});
 };
 

src/controllers/api.js

@@ -58,6 +58,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;
 
 		if (res.locals.isAPI) {
 			res.json(200, config);

src/meta.js

@@ -63,11 +63,6 @@ var fs = require('fs'),
 
 					callback(err, res);
 				}
-
-				// this might be a good spot to add a hook
-				if (field === 'defaultLang') {
-					translator.clearLoadedFiles();
-				}
 			});
 		},
 		setOnEmpty: function (field, value, callback) {
@@ -173,10 +168,8 @@ var fs = require('fs'),
 			isTopic: /^topic\/\d+\/?/,
 			isUserPage: /^user\/[^\/]+(\/[\w]+)?/
 		},
-		build: function (urlFragment, callback) {
-			var user = require('./user');
-
-			Meta.title.parseFragment(decodeURIComponent(urlFragment), function(err, title) {
+		build: function (urlFragment, language, callback) {
+			Meta.title.parseFragment(decodeURIComponent(urlFragment), language, function(err, title) {
 				if (err) {
 					title = Meta.config.browserTitle || 'NodeBB';
 				} else {
@@ -186,14 +179,14 @@ var fs = require('fs'),
 				callback(null, title);
 			});
 		},
-		parseFragment: function (urlFragment, callback) {
+		parseFragment: function (urlFragment, language, callback) {
 			var	translated = ['', 'recent', 'unread', 'users', 'notifications'];
 			if (translated.indexOf(urlFragment) !== -1) {
 				if (!urlFragment.length) {
 					urlFragment = 'home';
 				}
 
-				translator.translate('[[pages:' + urlFragment + ']]', function(translated) {
+				translator.translate('[[pages:' + urlFragment + ']]', language, function(translated) {
 					callback(null, translated);
 				});
 			} else if (this.tests.isCategory.test(urlFragment)) {
@@ -215,7 +208,7 @@ var fs = require('fs'),
 
 				User.getUsernameByUserslug(userslug, function(err, username) {
 					if (subpage) {
-						translator.translate('[[pages:user.' + subpage + ', ' + username + ']]', function(translated) {
+						translator.translate('[[pages:user.' + subpage + ', ' + username + ']]', language, function(translated) {
 							callback(null, translated);
 						});
 					} else {

src/middleware/middleware.js

@@ -143,30 +143,31 @@ middleware.checkAccountPermissions = function(req, res, next) {
 };
 
 middleware.buildHeader = function(req, res, next) {
-	async.parallel([
-		function(next) {
-			res.locals.renderHeader = true;
-			next();
+	res.locals.renderHeader = true;
+	async.parallel({
+		config: function(next) {
+			controllers.api.getConfig(req, res, next);
 		},
-		function(next) {
-			controllers.api.getConfig(req, res, function(err, config) {
-				res.locals.config = config;
-				next(err);
-			});
-		},
-		function(next) {
-			// consider caching this, since no user specific information is loaded here
-			app.render('footer', {}, function(err, template) {
-				translator.translate(template, function(parsedTemplate) {
-					res.locals.footer = parsedTemplate;
-					next(err);
-				});
-			});
+		footer: function(next) {
+			app.render('footer', {}, next);
 		}
-	], next);
+	}, function(err, results) {
+		if (err) {
+			return next(err);
+		}
+
+		res.locals.config = results.config;
+
+		translator.translate(results.footer, results.config.defaultLang, function(parsedTemplate) {
+			res.locals.footer = parsedTemplate;
+			next();
+		});
+	});
 };
 
 middleware.renderHeader = function(req, res, callback) {
+	var uid = req.user ? parseInt(req.user.uid, 10) : 0;
+
 	var custom_header = {
 		'navigation': []
 	};
@@ -218,8 +219,6 @@ middleware.renderHeader = function(req, res, callback) {
 			}
 		}
 
-		var uid = '0';
-
 		templateValues.metaTags = defaultMetaTags.concat(res.locals.metaTags || []).map(function(tag) {
 			if(!tag || typeof tag.content !== 'string') {
 				winston.warn('Invalid meta tag. ', tag);
@@ -239,9 +238,6 @@ middleware.renderHeader = function(req, res, callback) {
 			href: nconf.get('relative_path') + '/favicon.ico'
 		});
 
-		if(req.user && req.user.uid) {
-			uid = req.user.uid;
-		}
 
 		templateValues.useCustomCSS = false;
 		if (meta.config.useCustomCSS === '1') {
@@ -249,34 +245,30 @@ middleware.renderHeader = function(req, res, callback) {
 			templateValues.customCSS = meta.config.customCSS;
 		}
 
-		async.parallel([
-			function(next) {
-				translator.translate('[[pages:' + path.basename(req.url) + ']]', function(translated) {
-					var	metaTitle = templateValues.metaTags.filter(function(tag) {
-							return tag.name === 'title';
-						});
-
-					if (translated) {
-						templateValues.browserTitle = translated;
-					} else if (metaTitle.length > 0 && metaTitle[0].content) {
-						templateValues.browserTitle = metaTitle[0].content;
-					} else {
-						templateValues.browserTitle = meta.config.browserTitle || 'NodeBB';
-					}
-
-					next();
-				});
+		async.parallel({
+			title: function(next) {
+				if (uid) {
+					user.getSettings(uid, function(err, settings) {
+						if (err) {
+							return next(err);
+						}
+						meta.title.build(req.url.slice(1), settings.language, next);
+					});
+				} else {
+					meta.title.build(req.url.slice(1), meta.config.defaultLang, next);
+				}
 			},
-			function(next) {
-				user.isAdministrator(uid, function(err, isAdmin) {
-					templateValues.isAdmin = isAdmin || false;
-					next();
-				});
+			isAdmin: function(next) {
+				user.isAdministrator(uid, next);
 			}
-		], function() {
-			app.render('header', templateValues, function(err, template) {
-				callback(null, template);
-			});
+		}, function(err, results) {
+			if (err) {
+				return next(err);
+			}
+			templateValues.browserTitle = results.title;
+			templateValues.isAdmin = results.isAdmin || false;
+
+			app.render('header', templateValues, callback);
 		});
 	});
 };
@@ -322,7 +314,7 @@ middleware.processRender = function(req, res, next) {
 				middleware.renderHeader(req, res, function(err, template) {
 					str = template + str;
 
-					translator.translate(str, function(translated) {
+					translator.translate(str, res.locals.config.defaultLang, function(translated) {
 						fn(err, translated);
 					});
 				});

src/socket.io/meta.js

@@ -32,7 +32,16 @@ SocketMeta.reconnected = function(socket) {
 };
 
 SocketMeta.buildTitle = function(socket, text, callback) {
-	meta.title.build(text, callback);
+	if (socket.uid) {
+		user.getSettings(socket.uid, function(err, settings) {
+			if (err) {
+				return callback(err);
+			}
+			meta.title.build(text, settings.language, callback);
+		});
+	} else {
+		meta.title.build(text, meta.config.defaultLang, callback);
+	}
 };
 
 SocketMeta.updateHeader = function(socket, data, callback) {

src/user/settings.js

@@ -29,6 +29,7 @@ module.exports = function(User) {
 				settings.topicsPerPage = settings.topicsPerPage ? parseInt(settings.topicsPerPage, 10) : parseInt(meta.config.topicsPerPage, 10) || 20;
 				settings.postsPerPage = settings.postsPerPage ? parseInt(settings.postsPerPage, 10) : parseInt(meta.config.postsPerPage, 10) || 10;
 				settings.notificationSounds = settings.notificationSounds ? parseInt(settings.notificationSounds, 10) === 1 : true;
+				settings.language = settings.language || meta.config.defaultLang || 'en_GB';
 				callback(null, settings);
 			});
 		});
@@ -47,7 +48,8 @@ module.exports = function(User) {
 			usePagination: data.usePagination,
 			topicsPerPage: data.topicsPerPage,
 			postsPerPage: data.postsPerPage,
-			notificationSounds: data.notificationSounds
+			notificationSounds: data.notificationSounds,
+			language: data.language || meta.config.defaultLang
 		}, callback);
 	};
 };