From e1f016c0757a78c3c2e79625eff4aed93d0bae39 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Tue, 18 Feb 2014 12:16:33 -0500
Subject: [PATCH] closes #1046

---
 public/language/en_GB/global.json |  3 +++
 public/language/en_GB/topic.json  | 12 +++++++++++-
 public/src/forum/topic.js         | 12 ++++++------
 public/src/modules/composer.js    |  4 ++--
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/public/language/en_GB/global.json b/public/language/en_GB/global.json
index 3d36d5fc90..b1dff9ec46 100644
--- a/public/language/en_GB/global.json
+++ b/public/language/en_GB/global.json
@@ -11,6 +11,9 @@
 
 	"register": "Register",
 	"login": "Login",
+	"please_log_in": "Please Log In",
+
+	"posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
 
 	"welcome_back": "Welcome Back ",
 	"you_have_successfully_logged_in": "You have successfully logged in",
diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json
index 85a923afbb..08b22d3bdf 100644
--- a/public/language/en_GB/topic.json
+++ b/public/language/en_GB/topic.json
@@ -24,6 +24,13 @@
 	"flag_title": "Flag this post for moderation",
 	"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
 
+	"following_topic.title": "Following Topic",
+	"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
+	"not_following_topic.title": "Not Following Topic",
+	"not_following_topic.message": "You will no longer receive notifications from this topic.",
+
+	"login_to_subscribe": "Please register or log in in order to subscribe to this topic",
+
 	"watch": "Watch",
 	"share_this_post": "Share this Post",
 
@@ -72,5 +79,8 @@
 	"composer.discard": "Discard",
 	"composer.submit": "Submit",
 	"composer.replying_to": "Replying to",
-	"composer.new_topic": "New Topic"
+	"composer.new_topic": "New Topic",
+	"composer.drag_and_drop_images": "Drag and Drop Images Here",
+	"composer.content_is_parsed_with": "Content is parsed with",
+	"composer.upload_instructions": "Upload images by dragging & dropping them."
 }
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 382312141e..727e3cde20 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -290,8 +290,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 							app.alert({
 								alert_id: 'topic_follow',
 								timeout: 2500,
-								title: 'Following Topic',
-								message: 'You will now be receiving notifications when somebody posts to this topic.',
+								title: '[[topic:following_topic.title]]',
+								message: '[[topic:following_topic.message]]',
 								type: 'success'
 							});
 						}
@@ -302,8 +302,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 							app.alert({
 								alert_id: 'topic_follow',
 								timeout: 2500,
-								title: 'Not Following Topic',
-								message: 'You will no longer receive notifications from this topic.',
+								title: '[[topic:not_following_topic.title]]',
+								message: '[[topic:not_following_topic.message]]',
 								type: 'success'
 							});
 						}
@@ -320,8 +320,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 						return app.alert({
 							type: 'danger',
 							alert_id: 'topic_follow',
-							title: 'Please Log In',
-							message: 'Please register or log in in order to subscribe to this topic',
+							title: '[[global:please_log_in]]',
+							message: '[[topic:login_to_subscribe]]',
 							timeout: 5000
 						});
 					}
diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index ee833381e6..d5ba7e8e73 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -10,8 +10,8 @@ define(['taskbar'], function(taskbar) {
 				type: 'danger',
 				timeout: 5000,
 				alert_id: 'post_error',
-				title: 'Please Log In to Post',
-				message: 'Posting is currently restricted to registered members only, click here to log in',
+				title: '[[global:please_log_in]]',
+				message: '[[global:posting_restriction_info]]',
 				clickfn: function() {
 					ajaxify.go('login');
 				}