[ljcom] r10254: LJSUP-8123: change the logic of Show Spa...

U   trunk/bin/upgrading/en_LJ.dat
U   trunk/bin/upgrading/s2layers/sup/layout.s2

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2011-03-17 08:19:02 UTC (rev 10253)
+++ trunk/bin/upgrading/en_LJ.dat	2011-03-17 09:00:07 UTC (rev 10254)
@@ -6425,9 +6425,9 @@
 talk.copyright|staleness=1
 talk.copyright=The reproduction is prohibited in any form
 
-talk.hidespam=Hide spam - [[spam_counter]]
+talk.hidespam=[[spam_counter]] spam [[?spam_counter|comment|comments|comments]]
 
-talk.showspam=Show spam - [[spam_counter]]
+talk.showspam=Read [[spam_counter]] spam [[?spam_counter|comment|comments|comments]]
 
 talk.spellcheck=Check spelling during preview
 

Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2011-03-17 08:19:02 UTC (rev 10253)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2011-03-17 09:00:07 UTC (rev 10254)
@@ -938,7 +938,7 @@
 """;
         "<a name='comments'></a>";
         var string comments_showspam = "";
-        if ($e.comments.count > 0 and $e.comments.read_spam_url != "") {
+        if ($e.comments.spam_counter > 0 and $e.comments.read_spam_url != "") {
             if ($p.showspam) {
                 $comments_showspam = """<span class="comments-hidespam">""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</span> <span class="emdash">—</span> """;
             } else {