Committer: mchervonniy
LJSUP-8126: number of spam commentsU trunk/bin/upgrading/s2layers/sixhtml/layout.s2 U trunk/bin/upgrading/s2layers/sturdygesture/layout.s2
Modified: trunk/bin/upgrading/s2layers/sixhtml/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/sixhtml/layout.s2 2011-03-16 05:33:27 UTC (rev 18573) +++ trunk/bin/upgrading/s2layers/sixhtml/layout.s2 2011-03-16 05:48:56 UTC (rev 18574) @@ -1184,11 +1184,11 @@ if ($e.comments.show_postlink) { " $sep "; $e.comments->print_postlink(); } if ($e.comments.show_readlink) { " $sep "; $e.comments->print_readlink(); - if ($p.view == "entry") { + if ($p.view == "entry" and $e.comments.read_spam_url != "") { if ($p.showspam) { - print safe """ $sep <a href=\"$e.comments.read_spam_url\">$*text_hidespam ($e.comments.spam_counter)</a>"""; + print safe """ $sep """ + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments"); } else { - print safe """ $sep <a href=\"$e.comments.read_spam_url\">$*text_showspam ($e.comments.spam_counter)</a>"""; + print safe """ $sep <a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a>"""; } } } Modified: trunk/bin/upgrading/s2layers/sturdygesture/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/sturdygesture/layout.s2 2011-03-16 05:33:27 UTC (rev 18573) +++ trunk/bin/upgrading/s2layers/sturdygesture/layout.s2 2011-03-16 05:48:56 UTC (rev 18574) @@ -723,11 +723,11 @@ " | "; } if ($.show_readlink) { - if ($p.view == "entry") { + if ($p.view == "entry" and $.read_spam_url != "") { 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> | """; } } $this->print_readlink();