kareila: (Default)
kareila ([personal profile] kareila) wrote in [site community profile] changelog2010-07-17 03:33 pm

[dw-free] custom reply/# of comments text messed up on network page

[commit: http://hg.dwscoalition.org/dw-free/rev/e7c9a1c30739]

http://bugs.dwscoalition.org/show_bug.cgi?id=2788

Fix network view to use text_read_comments_friends, not text_read_comments.

Patch by [personal profile] ninetydegrees.

Files modified:
  • bin/upgrading/s2layers/core1.s2
  • bin/upgrading/s2layers/core2.s2
--------------------------------------------------------------------------------
diff -r 6c296a523b4e -r e7c9a1c30739 bin/upgrading/s2layers/core1.s2
--- a/bin/upgrading/s2layers/core1.s2	Fri Jul 16 22:45:32 2010 -0500
+++ b/bin/upgrading/s2layers/core1.s2	Sat Jul 17 10:33:42 2010 -0500
@@ -2631,7 +2631,7 @@ function CommentInfo::print_readlink {
 function CommentInfo::print_readlink {
     var Page p = get_page();
     print safe "<a href=\"$.read_url\">"+
-        get_plural_phrase($.count, $p.view == "read" ?
+        get_plural_phrase($.count, ( $p.view == "read" or $p.view == "network" ) ?
                           "text_read_comments_friends" : "text_read_comments")+
     "</a>";
 }
diff -r 6c296a523b4e -r e7c9a1c30739 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Fri Jul 16 22:45:32 2010 -0500
+++ b/bin/upgrading/s2layers/core2.s2	Sat Jul 17 10:33:42 2010 -0500
@@ -5148,7 +5148,7 @@ function CommentInfo::print_readlink {
 function CommentInfo::print_readlink {
     var Page p = get_page();
     print safe "<a href=\"$.read_url#comments\">"+
-        get_plural_phrase($.count, $p.view == "read" ?
+        get_plural_phrase($.count, ( $p.view == "read" or $p.view == "network" ) ?
                           "text_read_comments_friends" : "text_read_comments")+
     "</a>";
 }
--------------------------------------------------------------------------------