renamed reading to not-following

added more description text
v1.18.x
barisusakli 9 years ago
parent 11d3834eb9
commit b02869b0f8

@ -51,12 +51,12 @@
"watch.title": "Be notified of new replies in this topic", "watch.title": "Be notified of new replies in this topic",
"unwatch.title": "Stop watching this topic", "unwatch.title": "Stop watching this topic",
"share_this_post": "Share this Post", "share_this_post": "Share this Post",
"following": "Following", "watching": "Watching",
"reading": "Reading", "not-watching": "Not Watching",
"ignoring": "Ignoring", "ignoring": "Ignoring",
"following.description": "Notify me of new replies", "watching.description": "Notify me of new replies.<br/>Show topic in unread.",
"reading.description": "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 show topic in unread", "ignoring.description": "Do not notify me of new replies.<br/>Do not show topic in unread.",
"thread_tools.title": "Topic Tools", "thread_tools.title": "Topic Tools",
"thread_tools.markAsUnreadForAll": "Mark Unread", "thread_tools.markAsUnreadForAll": "Mark Unread",

@ -84,16 +84,16 @@ define('forum/topic/threadTools', [
fork.init(); fork.init();
$('.topic').on('click', '[component="topic/following"]', function() { $('.topic').on('click', '[component="topic/following"]', function() {
setFollow('follow'); changeWatching('follow');
}); });
$('.topic').on('click', '[component="topic/reading"]', function() { $('.topic').on('click', '[component="topic/not-following"]', function() {
setFollow('unfollow'); changeWatching('unfollow');
}); });
$('.topic').on('click', '[component="topic/ignoring"]', function() { $('.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) { socket.emit('topics.changeWatching', {tid: tid, type: type}, function(err) {
if (err) { if (err) {
return app.alert({ return app.alert({
@ -212,9 +212,9 @@ define('forum/topic/threadTools', [
menu.toggleClass('hidden', state !== 'follow'); menu.toggleClass('hidden', state !== 'follow');
components.get('topic/following/check').toggleClass('fa-check', 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'); 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 = components.get('topic/ignoring/menu');
menu.toggleClass('hidden', state !== 'ignore' ); menu.toggleClass('hidden', state !== 'ignore' );

@ -199,7 +199,7 @@ var social = require('./social');
topicData.thread_tools = results.threadTools.tools; topicData.thread_tools = results.threadTools.tools;
topicData.tags = results.tags; topicData.tags = results.tags;
topicData.isFollowing = results.isFollowing[0]; 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.isIgnoring = results.isIgnoring[0];
topicData.bookmark = results.bookmark; topicData.bookmark = results.bookmark;
topicData.postSharing = results.postSharing; topicData.postSharing = results.postSharing;

Loading…
Cancel
Save