From 303a32dce65b24f8f827426df0b6435403ffc158 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Thu, 30 Jan 2014 13:30:49 -0500
Subject: [PATCH] closes #855 - app.alert strings are now passed through
 translator so we can finally start getting rid of the remainder of hardcoded
 strings

---
 public/language/en/global.json | 11 ++++++++++-
 public/src/app.js              | 13 ++++++++-----
 public/src/forum/account.js    |  4 ++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/public/language/en/global.json b/public/language/en/global.json
index 210486f0a9..3cdef1742c 100644
--- a/public/language/en/global.json
+++ b/public/language/en/global.json
@@ -38,5 +38,14 @@
 	"motd.follow": "Follow",
 
 	"previouspage": "Previous Page",
-	"nextpage": "Next Page"
+	"nextpage": "Next Page",
+
+	"alert.success": "Success",
+	"alert.error": "Error",
+
+	"alert.banned": "Banned",
+	"alert.banned.message": "You are banned you will be logged out!",
+
+	"alert.unfollow": "You are no longer following %1!",
+	"alert.follow": "You are now following %1!"
 }
diff --git a/public/src/app.js b/public/src/app.js
index 8659ed3c00..9e41fb3a47 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -113,8 +113,8 @@ var socket,
 
 					socket.on('event:banned', function() {
 						app.alert({
-							title: 'Banned',
-							message: 'You are banned you will be logged out!',
+							title: '[[global:alert.banned]]',
+							message: '[[global:alert.banned.message]]',
 							type: 'warning',
 							timeout: 1000
 						});
@@ -190,7 +190,10 @@ var socket,
 			if (params.location == null)
 				params.location = 'alert_window';
 
-			$('#' + params.location).prepend(div.fadeIn('100'));
+			translator.translate(div.html(), function(translatedHTML) {
+				div.html(translatedHTML);
+				$('#' + params.location).prepend(div.fadeIn('100'));
+			});
 
 			if (params.timeout) {
 				startTimeout(div, params.timeout);
@@ -212,7 +215,7 @@ var socket,
 			timeout = 2000;
 
 		app.alert({
-			title: 'Success',
+			title: '[[global:alert.success]]',
 			message: message,
 			type: 'success',
 			timeout: timeout
@@ -224,7 +227,7 @@ var socket,
 			timeout = 2000;
 
 		app.alert({
-			title: 'Error',
+			title: '[[global:alert.error]]',
 			message: message,
 			type: 'danger',
 			timeout: timeout
diff --git a/public/src/forum/account.js b/public/src/forum/account.js
index e3c3ec7fe5..b15613810a 100644
--- a/public/src/forum/account.js
+++ b/public/src/forum/account.js
@@ -44,7 +44,7 @@ define(['forum/accountheader'], function(header) {
 
 					followBtn.addClass('hide');
 					unfollowBtn.removeClass('hide');
-					app.alertSuccess('You are now following ' + username + '!');
+					app.alertSuccess('[[global:alert.follow, ' + username + ']]');
 				});
 				return false;
 			});
@@ -59,7 +59,7 @@ define(['forum/accountheader'], function(header) {
 
 					followBtn.removeClass('hide');
 					unfollowBtn.addClass('hide');
-					app.alertSuccess('You are no longer following ' + username + '!');
+					app.alertSuccess('[[global:alert.unfollow, ' + username + ']]');
 				});
 				return false;
 			});