From b02869b0f8d58e3ce81e46dac4dffefe2ded780c Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 19 May 2016 14:20:34 +0300
Subject: [PATCH] renamed reading to not-following

added more description text
---
 public/language/en_GB/topic.json       | 10 +++++-----
 public/src/client/topic/threadTools.js | 14 +++++++-------
 src/topics.js                          |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json
index 176e9daa52..11b835981b 100644
--- a/public/language/en_GB/topic.json
+++ b/public/language/en_GB/topic.json
@@ -51,12 +51,12 @@
 	"watch.title": "Be notified of new replies in this topic",
 	"unwatch.title": "Stop watching this topic",
 	"share_this_post": "Share this Post",
-	"following": "Following",
-	"reading": "Reading",
+	"watching": "Watching",
+	"not-watching": "Not Watching",
 	"ignoring": "Ignoring",
-	"following.description": "Notify me of new replies",
-	"reading.description": "Show topic in unread",
-	"ignoring.description": "Do not show topic in unread",
+	"watching.description": "Notify me of new replies.<br/>Show topic in unread.",
+	"not-watching.description": "Do not notify me of new replies.<br/>Show topic in unread if category is not ignored.",
+	"ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
 
 	"thread_tools.title": "Topic Tools",
 	"thread_tools.markAsUnreadForAll": "Mark Unread",
diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js
index adc110e8a6..605981f484 100644
--- a/public/src/client/topic/threadTools.js
+++ b/public/src/client/topic/threadTools.js
@@ -84,16 +84,16 @@ define('forum/topic/threadTools', [
 		fork.init();
 
 		$('.topic').on('click', '[component="topic/following"]', function() {
-			setFollow('follow');
+			changeWatching('follow');
 		});
-		$('.topic').on('click', '[component="topic/reading"]', function() {
-			setFollow('unfollow');
+		$('.topic').on('click', '[component="topic/not-following"]', function() {
+			changeWatching('unfollow');
 		});
 		$('.topic').on('click', '[component="topic/ignoring"]', function() {
-			setFollow('ignore');
+			changeWatching('ignore');
 		});
 
-		function setFollow(type) {
+		function changeWatching(type) {
 			socket.emit('topics.changeWatching', {tid: tid, type: type}, function(err) {
 				if (err) {
 					return app.alert({
@@ -212,9 +212,9 @@ define('forum/topic/threadTools', [
 		menu.toggleClass('hidden', state !== 'follow');
 		components.get('topic/following/check').toggleClass('fa-check', state === 'follow');
 
-		menu = components.get('topic/reading/menu');
+		menu = components.get('topic/not-following/menu');
 		menu.toggleClass('hidden', state !== 'unfollow');
-		components.get('topic/reading/check').toggleClass('fa-check', state === 'unfollow');
+		components.get('topic/not-following/check').toggleClass('fa-check', state === 'unfollow');
 
 		menu = components.get('topic/ignoring/menu');
 		menu.toggleClass('hidden', state !== 'ignore' );
diff --git a/src/topics.js b/src/topics.js
index 8c09238e18..45f87ebfec 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -199,7 +199,7 @@ var social = require('./social');
 				topicData.thread_tools = results.threadTools.tools;
 				topicData.tags = results.tags;
 				topicData.isFollowing = results.isFollowing[0];
-				topicData.isReading = !results.isFollowing[0] && !results.isIgnoring[0];
+				topicData.isNotFollowing = !results.isFollowing[0] && !results.isIgnoring[0];
 				topicData.isIgnoring = results.isIgnoring[0];
 				topicData.bookmark = results.bookmark;
 				topicData.postSharing = results.postSharing;