[ljcom] r7535: LJSUP-4604: Changing method of adding nu...

U   trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
U   trunk/bin/upgrading/s2layers/sup/layout.s2
U   trunk/bin/upgrading/s2layers/voxhtml/layout.s2

Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2009-08-04 04:01:28 UTC (rev 7534)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2	2009-08-04 09:15:42 UTC (rev 7535)
@@ -2081,7 +2081,7 @@
     var string comments_count = string($.entry.comments.count);
     if ($.viewing_thread) {
         var string toplink = (($.comment_pages.total > 1) ? ($.comment_pages->url_of($.comment_pages.current)) : $.entry.permalink_url) + "#comments";
-        $comments_count = """<a href="$toplink">$*text_reply_back: $comments_count</a>""";
+        $comments_count = """<a href="$toplink">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a>""";
     } else {
         $comments_count = get_plural_phrase($.entry.comments.count, "text_read_comments");
     }
@@ -2427,7 +2427,7 @@
             "</div>";
 
     """<div class="box">
-    <center><b>( <a href="$.entry.permalink_url#comments">Read comments: $.entry.comments.count</a> )</b> </center>
+    <center><b>( <a href="$.entry.permalink_url#comments">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a> )</b> </center>
     Post a comment in response:<br/>""";
     $.form->print();
     "

Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2009-08-04 04:01:28 UTC (rev 7534)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2009-08-04 09:15:42 UTC (rev 7535)
@@ -885,7 +885,7 @@
     var string comments_count = string($e.comments.count);
     if ($.viewing_thread) {
         var string toplink = (($.comment_pages.total > 1) ? ($.comment_pages->url_of($.comment_pages.current)) : $e.permalink_url) + "#comments";
-        $comments_count = """<a href="$toplink">$*text_reply_back: $comments_count</a>""";
+        $comments_count = """<a href="$toplink">"""+ get_plural_phrase($e.comments.count, "text_read_all_comments") +"""</a>""";
     } else {
         $comments_count = get_plural_phrase($e.comments.count, "text_read_comments");
     }
@@ -938,7 +938,7 @@
                         <div class="entry-text"><div class="entry-comments-text">
 """;
 
-    print safe """<div class="comments-links">( <a href="$.entry.permalink_url#comments">$*text_reply_back: $e.comments.count</a> )</div>""";
+    print safe """<div class="comments-links">( <a href="$.entry.permalink_url#comments">"""+ get_plural_phrase($e.comments.count, "text_read_all_comments") +"""</a> )</div>""";
     if (not $.entry.comments.enabled) {
         print safe "<h1>$*text_reply_nocomments_header</h1><p>$*text_reply_nocomments</p>";
     } else {

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2009-08-04 04:01:28 UTC (rev 7534)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2009-08-04 09:15:42 UTC (rev 7535)
@@ -1920,7 +1920,7 @@
         var string comments_count = string($.entry.comments.count);
         if ($.viewing_thread) {
             var string toplink = (($.comment_pages.total > 1) ? ($.comment_pages->url_of($.comment_pages.current)) : $.entry.permalink_url) + "#comments";
-            $comments_count = """<a href="$toplink">$*text_reply_back: $comments_count</a>""";
+            $comments_count = """<a href="$toplink">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a>""";
         } else {
             $comments_count = get_plural_phrase($.entry.comments.count, "text_read_comments");
         }
@@ -2409,7 +2409,7 @@
     <h2 class="comments-header page-header2">$*text_replyform_header</h2>
     <div class="comments-body">
       <div class="comments-nav">
-        ( <a href="$.entry.permalink_url#comments">$*text_reply_back: $.entry.comments.count</a> )
+        ( <a href="$.entry.permalink_url#comments">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a> )
       </div>
       <a name="replyform"></a>
       <div class="replyform">""";
@@ -2418,7 +2418,7 @@
 
     """
         <div class="comments-nav">
-          ( <a href="$.entry.permalink_url#comments">$*text_reply_back: $.entry.comments.count</a> )
+          ( <a href="$.entry.permalink_url#comments">"""+ get_plural_phrase($.entry.comments.count, "text_read_all_comments") +"""</a> )
         </div>
       </div>
     </div>""";