[ljcom] r10248: LJSUP-8126: number of spam comments

U   trunk/bin/upgrading/s2layers/boxer/layout.s2

Modified: trunk/bin/upgrading/s2layers/boxer/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/boxer/layout.s2	2011-03-16 06:59:15 UTC (rev 10247)
+++ trunk/bin/upgrading/s2layers/boxer/layout.s2	2011-03-16 07:29:49 UTC (rev 10248)
@@ -932,11 +932,11 @@
 
                     # spam link
                     var string comments_showspam = "";
-                    if ($e.comments.count > 0 and not $e.comments.locked) {
+                    if ($e.comments.count > 0 and $e.comments.read_spam_url != "") {
                         if ($p.showspam) {
-                            $comments_showspam = """ <span class="icon"><a href="$e.comments.read_spam_url"><img src="$*SITEROOT/img/btn_unspam.gif" align="middle" border="0" alt="$*text_hidespam" title="$*text_hidespam ($e.comments.spam_counter)" /></a></span> """;
+                            $comments_showspam = """ <span class="icon"><img src="$*SITEROOT/img/btn_unspam.gif" align="middle" border="0" alt="$*text_hidespam" title=\"""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """\" /></a></span> """;
                         } else {
-                            $comments_showspam = """ <span class="icon"><a href="$e.comments.read_spam_url"><img src="$*SITEROOT/img/btn_spam.gif" align="middle" border="0" alt="$*text_showspam" title="$*text_showspam ($e.comments.spam_counter)" /></a></span> """;
+                            $comments_showspam = """ <span class="icon"><a href="$e.comments.read_spam_url"><img src="$*SITEROOT/img/btn_spam.gif" align="middle" border="0" alt="$*text_showspam" title=\"""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """\" /></a></span> """;
                         }
                     }
                     if ($p.view == "entry") {