From 3b3c383d93239aa7b14cf180d0232bb325ec6c63 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Mon, 17 Aug 2015 17:20:41 -0400
Subject: [PATCH 1/3] adding a fallback for en_GB and en_US

---
 public/src/modules/translator.js | 47 ++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/public/src/modules/translator.js b/public/src/modules/translator.js
index 90784747c9..96ec0b513a 100644
--- a/public/src/modules/translator.js
+++ b/public/src/modules/translator.js
@@ -47,33 +47,38 @@
 		// Load the appropriate timeago locale file, and correct NodeBB language codes to timeago codes, if necessary
 		var	languageCode;
 		switch(config.userLang) {
-		case 'cs':
-			languageCode = 'cz';
-			break;
+			case 'en_GB':
+			case 'en_US':
+				languageCode = 'en';
+				break;
 
-		case 'fa_IR':
-			languageCode = 'fa';
-			break;
+			case 'cs':
+				languageCode = 'cz';
+				break;
 
-		case 'pt_BR':
-			languageCode = 'pt-br';
-			break;
+			case 'fa_IR':
+				languageCode = 'fa';
+				break;
 
-		case 'nb':
-			languageCode = 'no';
-			break;
+			case 'pt_BR':
+				languageCode = 'pt-br';
+				break;
 
-		case 'zh_TW':
-			languageCode = 'zh-TW';
-			break;
+			case 'nb':
+				languageCode = 'no';
+				break;
 
-		case 'zh_CN':
-			languageCode = 'zh-CN';
-			break;
+			case 'zh_TW':
+				languageCode = 'zh-TW';
+				break;
 
-		default:
-			languageCode = config.userLang;
-			break;
+			case 'zh_CN':
+				languageCode = 'zh-CN';
+				break;
+
+			default:
+				languageCode = config.userLang;
+				break;
 		}
 
 		$.getScript(RELATIVE_PATH + '/vendor/jquery/timeago/locales/jquery.timeago.' + languageCode + '.js').success(function() {

From 4b0f50f57e7916354968075eed094b8da7e9b032 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Tue, 18 Aug 2015 11:02:14 -0400
Subject: [PATCH 2/3] closes #3448

---
 public/src/utils.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/src/utils.js b/public/src/utils.js
index 66ee10f6cf..4b3b4464fc 100644
--- a/public/src/utils.js
+++ b/public/src/utils.js
@@ -206,9 +206,13 @@
 		overrideTimeago: function() {
 			var timeagoFn = $.fn.timeago;
 			$.fn.timeago = function() {
-				timeagoFn.apply(this, arguments).each(function() {
-					$(this).attr('title', (new Date($(this).attr('title'))).toString());
-				});
+				var els = timeagoFn.apply(this, arguments);
+
+				if (els) {
+					els.each(function() {
+						$(this).attr('title', (new Date($(this).attr('title'))).toString());
+					});
+				}
 			};
 		},
 

From a990e9c3bfce76f54e8d018ff259604bdd802cda Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Tue, 18 Aug 2015 11:27:22 -0400
Subject: [PATCH 3/3] closes #3449

---
 package.json             | 4 ++--
 src/controllers/index.js | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index aa2b796071..0e47780a71 100644
--- a/package.json
+++ b/package.json
@@ -49,8 +49,8 @@
     "nodebb-plugin-spam-be-gone": "0.4.1",
     "nodebb-rewards-essentials": "0.0.3",
     "nodebb-theme-lavender": "1.0.49",
-    "nodebb-theme-persona": "2.0.12",
-    "nodebb-theme-vanilla": "3.0.6",
+    "nodebb-theme-persona": "2.0.13",
+    "nodebb-theme-vanilla": "3.0.7",
     "nodebb-widget-essentials": "1.0.4",
     "npm": "^2.1.4",
     "passport": "^0.2.1",
diff --git a/src/controllers/index.js b/src/controllers/index.js
index 70854a548a..e7ca7e075f 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -110,6 +110,9 @@ Controllers.register = function(req, res, next) {
 			}
 		},
 		function(next) {
+			plugins.fireHook('filter:parse.post', {postData: {content: meta.config.termsOfUse}}, next);
+		},
+		function(tos, next) {
 			var loginStrategies = require('../routes/authentication').getLoginStrategies();
 			var data = {
 				'register_window:spansize': loginStrategies.length ? 'col-md-6' : 'col-md-12',
@@ -121,7 +124,7 @@ Controllers.register = function(req, res, next) {
 			data.minimumUsernameLength = meta.config.minimumUsernameLength;
 			data.maximumUsernameLength = meta.config.maximumUsernameLength;
 			data.minimumPasswordLength = meta.config.minimumPasswordLength;
-			data.termsOfUse = meta.config.termsOfUse;
+			data.termsOfUse = tos.postData.content;
 			data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[register:register]]'}]);
 			data.regFormEntry = [];
 			data.error = req.flash('error')[0];