Максим Червонный (fiskus_boulder) wrote in changelog,
Максим Червонный
fiskus_boulder
changelog

[livejournal] r18572: LJSUP-8126: number of spam comments

Committer: mchervonniy
LJSUP-8126: number of spam comments
U   trunk/bin/upgrading/s2layers/punquin/layout.s2
U   trunk/bin/upgrading/s2layers/refriedpaper/layout.s2
Modified: trunk/bin/upgrading/s2layers/punquin/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/punquin/layout.s2	2011-03-16 05:28:52 UTC (rev 18571)
+++ trunk/bin/upgrading/s2layers/punquin/layout.s2	2011-03-16 05:30:07 UTC (rev 18572)
@@ -672,16 +672,16 @@
         print safe "$*text_left_comments";
         if ($.show_readlink) {
             $this->print_readlink();
-            if ($p.view == "entry") {
+            if ($p.view == "entry" and $.read_spam_url != "") {
                 if (clean_url($*img_btwn_comments) != "") {
                     """ <img src="$*img_btwn_comments" alt="" /> """;
                 } else {
                     print safe "$*text_btwn_comments";
                 }
                 if ($p.showspam) {
-                    print safe """<a href=\"$.read_spam_url\">$*text_hidespam ($.spam_counter)</a> """;
+                    print safe get_plural_phrase($.spam_counter, "text_read_spam_comments");
                 } else {
-                    print safe """<a href=\"$.read_spam_url\">$*text_showspam ($.spam_counter)</a>""";
+                    print safe """<a href=\"$.read_spam_url\">""" + get_plural_phrase($.spam_counter, "text_read_all_spam_comments") + """</a>""";
                 }
             }
         }

Modified: trunk/bin/upgrading/s2layers/refriedpaper/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/refriedpaper/layout.s2	2011-03-16 05:28:52 UTC (rev 18571)
+++ trunk/bin/upgrading/s2layers/refriedpaper/layout.s2	2011-03-16 05:30:07 UTC (rev 18572)
@@ -801,11 +801,11 @@
           $linkbar = $linkbar + """ $text""";
         }
         $linkbar = $linkbar + """</a>$btwn_comments""";
-        if ($p.view == "entry") {
+        if ($p.view == "entry" and $en.comments.read_spam_url != "") {
             if ($p.showspam) {
-                $linkbar = $linkbar + """<a href=\"$en.comments.read_spam_url\">$*text_hidespam ($en.comments.spam_counter)</a>$btwn_comments""";
+                $linkbar = $linkbar + get_plural_phrase($en.comments.spam_counter, "text_read_spam_comments") + """$btwn_comments""";
             } else {
-                $linkbar = $linkbar + """<a href=\"$en.comments.read_spam_url\">$*text_showspam ($en.comments.spam_counter)</a>$btwn_comments""";
+                $linkbar = $linkbar + """<a href=\"$en.comments.read_spam_url\">""" + get_plural_phrase($en.comments.spam_counter, "text_read_all_spam_comments") + """</a>$btwn_comments""";
             }
         }
       }

Tags: fiskus_boulder, livejournal, s2
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments