From 3c96857123f4bebfcab4a6eacd6e4f194f26c610 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 3 May 2014 00:07:01 -0400 Subject: [PATCH] closes #1461 fixed disabled category grey out, added plural move topics string --- public/language/en_GB/topic.json | 1 + public/src/forum/topic/move.js | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json index 2af258a89d..8958beb1dc 100644 --- a/public/language/en_GB/topic.json +++ b/public/language/en_GB/topic.json @@ -82,6 +82,7 @@ "loading_more_posts": "Loading More Posts", "move_topic": "Move Topic", + "move_topics": "Move Topics", "move_post": "Move Post", "post_moved": "Post moved!", "fork_topic": "Fork Topic", diff --git a/public/src/forum/topic/move.js b/public/src/forum/topic/move.js index 937b072124..c1a0fe2d59 100644 --- a/public/src/forum/topic/move.js +++ b/public/src/forum/topic/move.js @@ -19,6 +19,13 @@ define(function() { modal.on('shown.bs.modal', onMoveModalShown); $('#move-confirm').hide(); + + if (tids.length > 1) { + translator.translate('[[topic:move_topics]]', function(translated) { + modal.find('.modal-header h3').text(translated); + }); + } + modal.modal('show'); }; @@ -93,9 +100,10 @@ define(function() { if(parseInt(info.cid, 10) === parseInt(Move.currentCid, 10)) { continue; } + $('
  • ') .css({background: info.bgColor, color: info.color || '#fff'}) - .addClass(info.disabled === '1' ? ' disabled' : '') + .toggleClass('disabled', info.disabled) .attr('data-cid', info.cid) .html(' ' + info.name) .appendTo(categoriesEl);