fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2012-05-31 03:33 pm

[dw-free] add link to /feeds on manage circle page

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

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

Links to feeds from manage circle page, allowing for translation string
oddities

Patch by [personal profile] kaberett.

Files modified:
  • htdocs/manage/circle/edit.bml
  • htdocs/manage/circle/edit.bml.text
--------------------------------------------------------------------------------
diff -r 52f2b0fa04b2 -r 0f2ffc4d1d51 htdocs/manage/circle/edit.bml
--- a/htdocs/manage/circle/edit.bml	Thu May 31 23:13:34 2012 +0800
+++ b/htdocs/manage/circle/edit.bml	Thu May 31 23:34:54 2012 +0800
@@ -59,6 +59,7 @@
         $ret .= "<form method='post' name='editFriends' action='edit$getextra'>\n";
         $ret .= LJ::form_auth();
         $ret .= "<p>" . BML::ml( '.circle.intro', { aopts1 => "href='#editpeople'", aopts2 => "href='#editcomms'", aopts3 => "href='#editfeeds'", aopts4 => "href='$LJ::SITEROOT/manage/settings/?cat=notifications'" }) . "</p>\n\n";
+        $ret .= "<p>" . BML::ml( '.circle.intro.feeds', { sitename => "$LJ::SITENAMESHORT", aopts => "href='$LJ::SITEROOT/feeds'" }) . "</p>\n\n";
         $ret .= "<?h2 $ML{'.circle.header'} h2?>\n";
 
         # little standout box to repeat before each section:
diff -r 52f2b0fa04b2 -r 0f2ffc4d1d51 htdocs/manage/circle/edit.bml.text
--- a/htdocs/manage/circle/edit.bml.text	Thu May 31 23:13:34 2012 +0800
+++ b/htdocs/manage/circle/edit.bml.text	Thu May 31 23:34:54 2012 +0800
@@ -35,6 +35,8 @@
 
 .circle.intro=Here are the <a [[aopts1]]>people</a>, <a [[aopts2]]>communities</a>, and <a [[aopts3]]>feeds</a> that are in your circle.  You can change who appears on your Reading Page and who you give access to by using the check boxes.  You can also <a [[aopts4]]>edit your notification tracking options</a>.
 
+.circle.intro.feeds=You can also use [[sitename]] as a syndicated feed reader to have posts from other sites show up on your [[sitename]] reading page. To browse existing feeds or add a new one, visit <a [[aopts]]>the list of popular feeds.</a>
+
 .circle.intro.nonpeople=These are the communities and feeds in your Circle. You can use the checkboxes to unsubscribe from these accounts.
 
 .circle.join.apply=<a [[aopts]]>Apply to join?</a>
--------------------------------------------------------------------------------