[livejournal] r18679: LJSUP-8134: ML vars for "OK" button

U   trunk/bin/upgrading/en.dat
U   trunk/htdocs/js/commentmanage.js

Modified: trunk/bin/upgrading/en.dat
===================================================================
--- trunk/bin/upgrading/en.dat	2011-03-23 04:55:33 UTC (rev 18678)
+++ trunk/bin/upgrading/en.dat	2011-03-23 05:15:01 UTC (rev 18679)
@@ -59,6 +59,8 @@
 comment.mark.spam.title=Do you really want to mark comment as a spam?
 
 comment.mark.spam.subject=All comments of this author will be deleted and we will ban author.
+
+comment.mark.spam.button=OK
  
 community.election.owner.election.link=The owner of the [[community]] community is not selected yet. You can <a [[href]]>vote for owner here</a>.
 

Modified: trunk/htdocs/js/commentmanage.js
===================================================================
--- trunk/htdocs/js/commentmanage.js	2011-03-23 04:55:33 UTC (rev 18678)
+++ trunk/htdocs/js/commentmanage.js	2011-03-23 05:15:01 UTC (rev 18679)
@@ -424,7 +424,7 @@
         var canAdmin = LJ_cmtinfo.canAdmin;
 		
 		if (action == 'markAsSpam') {
-			var popupElem = createPopup('<div class="b-popup-group"><div class="b-popup-row b-popup-row-head"><strong>' + getLocalizedStr('comment.mark.spam.title', comUser) + '</strong></div><div class="b-popup-row">' + getLocalizedStr('comment.mark.spam.subject', comUser) + '</div><div class="b-popup-row"><input type="button" class="spam-comment-button" value="OK"></div><div>', ae, e, 'spamComment' + dItemid);
+			var popupElem = createPopup('<div class="b-popup-group"><div class="b-popup-row b-popup-row-head"><strong>' + getLocalizedStr('comment.mark.spam.title', comUser) + '</strong></div><div class="b-popup-row">' + getLocalizedStr('comment.mark.spam.subject', comUser) + '</div><div class="b-popup-row"><input type="button" class="spam-comment-button" value="' + getLocalizedStr('comment.mark.spam.button', comUser) + '"></div><div>', ae, e, 'spamComment' + dItemid);
 			
 			if (popupElem) {
 				popupElem.delegate('.spam-comment-button', 'click', function (e) {
@@ -443,10 +443,12 @@
 	            inHTML.push("<div class='b-popup-row'><input type='checkbox' name='ban' id='" + lbl + "'> <label for='" + lbl + "'>" + getLocalizedStr( 'comment.ban.user', comUser ) + "</label></div>");
 	        }
 	
+			/*
 	        if (remoteUser != com.username) {
 	            lbl = "ljpopdel" + dItemid + "spam";
 	            inHTML.push("<div class='b-popup-row'><input type='checkbox' name='spam' id='" + lbl + "'> <label for='" + lbl + "'>" + getLocalizedStr( 'comment.mark.spam', comUser ) + "</label></div>");
 	        }
+	        */
 	
 	        if (com.rc && com.rc.length && canAdmin) {
 	            lbl = "ljpopdel" + dItemid + "thread";