[dw-free] In-page text refers to "Reading List" instead of "Reading Page" at sev

[fu]

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

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

Consolidate to one term (Reading Page) for less confusion.

Patch by rb.

Files modified:

• bin/upgrading/en.dat
• bin/upgrading/s2layers/core2.s2
• cgi-bin/DW/Widget/LatestNews.pm
• cgi-bin/DW/Widget/ReadingList.pm
• cgi-bin/LJ/Event/NewUserpic.pm
• cgi-bin/LJ/Event/UserMessageRecvd.pm

--------------------------------------------------------------------------------
diff -r 0f6b36e4965d -r b36cbb8ac0f2 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Thu Sep 22 12:15:22 2011 +0800
+++ b/bin/upgrading/en.dat	Thu Sep 22 12:33:10 2011 +0800
@@ -4785,7 +4785,7 @@
 
 widget.latestnews.comments=[[num_comments]] [[?num_comments|comment|comments]]
 
-widget.latestnews.subscribe.add=<a [[aopts]]>Add</a> [[news]] to your reading list
+widget.latestnews.subscribe.add2=<a [[aopts]]>Subscribe</a> to [[news]]
 
 widget.latestnews.subscribe.modify=<a [[aopts]]>Modify your subscription</a> to [[news]]
 
@@ -4921,9 +4921,9 @@
 
 widget.readinglist.filters.title=Your Subscription Filters
 
-widget.readinglist.readpage=Check out recent updates on your <a [[aopts]]>reading list</a>!
-
-widget.readinglist.title=Reading List
+widget.readinglist.readpage2=Check out recent updates on your <a [[aopts]]>reading page</a>!
+
+widget.readinglist.title2=Reading Page
 
 widget.recentcomments.anon=Somebody
 
diff -r 0f6b36e4965d -r b36cbb8ac0f2 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Thu Sep 22 12:15:22 2011 +0800
+++ b/bin/upgrading/s2layers/core2.s2	Thu Sep 22 12:33:10 2011 +0800
@@ -1234,8 +1234,8 @@
 property bool use_journalstyle_icons_page  { des = "Show icons page in my journal style rather than the site skin"; }
 set use_journalstyle_icons_page = false;
 
-# Defaults to false, but layouts can set it to true to switch on custom colors for different posters on reading list.
-property bool use_custom_friend_colors  { des = "Use my custom reading list colors"; }
+# Defaults to false, but layouts can set it to true to switch on custom colors for different posters on reading page.
+property bool use_custom_friend_colors  { des = "Use my custom reading page colors"; }
 set use_custom_friend_colors = false;
 
 
diff -r 0f6b36e4965d -r b36cbb8ac0f2 cgi-bin/DW/Widget/LatestNews.pm
--- a/cgi-bin/DW/Widget/LatestNews.pm	Thu Sep 22 12:15:22 2011 +0800
+++ b/cgi-bin/DW/Widget/LatestNews.pm	Thu Sep 22 12:33:10 2011 +0800
@@ -56,7 +56,7 @@
             aopts => "href='$LJ::SITEROOT/manage/circle/add?user=" . $news_journal->user . "'",
             news => LJ::ljuser( $news_journal ) } ) . "</p>";
     } else {
-        $ret .= "<p>" . $class->ml( 'widget.latestnews.subscribe.add', { 
+        $ret .= "<p>" . $class->ml( 'widget.latestnews.subscribe.add2', { 
             aopts => "href='$LJ::SITEROOT/manage/circle/add?user=" . $news_journal->user. "&action=subscribe'",
             news => LJ::ljuser( $news_journal ) } ) . "</p>";
     }
diff -r 0f6b36e4965d -r b36cbb8ac0f2 cgi-bin/DW/Widget/ReadingList.pm
--- a/cgi-bin/DW/Widget/ReadingList.pm	Thu Sep 22 12:15:22 2011 +0800
+++ b/cgi-bin/DW/Widget/ReadingList.pm	Thu Sep 22 12:33:10 2011 +0800
@@ -29,8 +29,8 @@
     my @watched = $remote->watched_users;
     $count{$_->journaltype_readable}++ foreach @watched;
 
-    my $ret = "<h2>" . $class->ml( 'widget.readinglist.title' ) . "</h2>";
-    $ret .= "<p>" . $class->ml( 'widget.readinglist.readpage', { aopts => "href='" . $remote->journal_base. "/read'" } ) . "</p>";
+    my $ret = "<h2>" . $class->ml( 'widget.readinglist.title2' ) . "</h2>";
+    $ret .= "<p>" . $class->ml( 'widget.readinglist.readpage2', { aopts => "href='" . $remote->journal_base. "/read'" } ) . "</p>";
     $ret .= "<p>" . $class->ml( 'widget.readinglist.breakdown.header' ) . "</p>";
     $ret .= "<ul><li>" . $class->ml( 'widget.readinglist.breakdown.personal', { num => $count{personal} } ) . "</li>";
     $ret .= "<li>" . $class->ml( 'widget.readinglist.breakdown.communities', { num => $count{community} } ) . "</li>";
diff -r 0f6b36e4965d -r b36cbb8ac0f2 cgi-bin/LJ/Event/NewUserpic.pm
--- a/cgi-bin/LJ/Event/NewUserpic.pm	Thu Sep 22 12:15:22 2011 +0800
+++ b/cgi-bin/LJ/Event/NewUserpic.pm	Thu Sep 22 12:33:10 2011 +0800
@@ -84,7 +84,7 @@
 
     unless ( $u->watches( $self->userpic->owner ) ) {
         $email .= "
-  - Add $poster to your reading list:
+  - Subscribe to $poster:
     $LJ::SITEROOT/manage/circle/add?user=$poster&action=subscribe";
     }
 
@@ -126,7 +126,7 @@
 You can:<ul>";
 
     $email .= "<li><a href=\"$icons_url\">View all of $postername\'s icons</a></li>";
-    $email .= "<li><a href=\"$LJ::SITEROOT/manage/circle/add?user=$postername&action=subscribe\">Add $postername to your reading list</a></li>"
+    $email .= "<li><a href=\"$LJ::SITEROOT/manage/circle/add?user=$postername&action=subscribe\">Subscribe to $postername</a></li>"
         unless $u->watches( $self->userpic->owner );
     $email .= "<li><a href=\"$journal_url\">View their journal</a></li>";
     $email .= "<li><a href=\"$profile\">View their profile</a></li></ul>";
diff -r 0f6b36e4965d -r b36cbb8ac0f2 cgi-bin/LJ/Event/UserMessageRecvd.pm
--- a/cgi-bin/LJ/Event/UserMessageRecvd.pm	Thu Sep 22 12:15:22 2011 +0800
+++ b/cgi-bin/LJ/Event/UserMessageRecvd.pm	Thu Sep 22 12:33:10 2011 +0800
@@ -125,7 +125,7 @@
 
     my $ret = "<div class='actions'>";
     $ret .= " <a href='$LJ::SITEROOT/inbox/compose?mode=reply&msgid=$msgid'>Reply</a>";
-    $ret .= " | <a href='$LJ::SITEROOT/manage/circle/add?user=". $msg->other_u->user ."&action=subscribe'>Add to reading list</a>"
+    $ret .= " | <a href='$LJ::SITEROOT/manage/circle/add?user=". $msg->other_u->user ."&action=subscribe'>Subscribe to ". $msg->other_u->user ."</a>"
         unless $u->watches( $msg->other_u );
     $ret .= " | <a href='$LJ::SITEROOT/inbox/markspam?msgid=". $msg->msgid ."'>Mark as Spam</a>"
         unless LJ::sysban_check( 'spamreport', $u->user );
--------------------------------------------------------------------------------