Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / actions / peopletag.php

diff --git a/actions/peopletag.php b/actions/peopletag.php
index d549586f13df1bdf1ffbbe366686c247da3d47ea..46bdd165cf3566ad9f193b2e7c1ac21034bb480e 100644 (file)
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * People tags by a user
+ * Lists by a user
  *
  * PHP version 5
  *
@@ -44,7 +44,7 @@ class PeopletagAction extends Action
     var $page = null;
     var $tag = null;
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
@@ -52,13 +52,17 @@ class PeopletagAction extends Action
     function title()
     {
         if ($this->page == 1) {
-            return sprintf(_("Public people tag %s"), $this->tag);
+            // TRANS: Title for list page.
+            // TRANS: %s is a list.
+            return sprintf(_('Public list %s'), $this->tag);
         } else {
-            return sprintf(_("Public people tag %s, page %d"), $this->tag, $this->page);
+            // TRANS: Title for list page.
+            // TRANS: %1$s is a list, %2$d is a page number.
+            return sprintf(_('Public list %1$s, page %2$d'), $this->tag, $this->page);
         }
     }
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@@ -74,14 +78,13 @@ class PeopletagAction extends Action
                 $args['page'] = $this->page;
             }
             common_redirect(common_local_url('peopletag', $args), 301);
-            return false;
         }
         $this->tag = $tag;
 
         return true;
     }
 
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
         $this->showPage();
@@ -96,12 +99,14 @@ class PeopletagAction extends Action
     function showAnonymousMessage()
     {
         $notice =
-          _('People tags are how you sort similar ' .
+          // TRANS: Message for anonymous users on list page.
+          // TRANS: This message contains Markdown links in the form [description](link).
+          _('Lists are how you sort similar ' .
             'people on %%site.name%%, a [micro-blogging]' .
             '(http://en.wikipedia.org/wiki/Micro-blogging) service ' .
             'based on the Free Software [StatusNet](http://status.net/) tool. ' .
             'You can then easily keep track of what they ' .
-            'are doing by subscribing to the tag\'s timeline.' );
+            'are doing by subscribing to the list\'s timeline.' );
         $this->elementStart('div', array('id' => 'anon_notice'));
         $this->raw(common_markup_to_html($notice));
         $this->elementEnd('div');
@@ -140,7 +145,7 @@ class PeopletagAction extends Action
         } else {
             $ptags->whereAdd('(profile_list.private = false OR (' .
                              ' profile_list.tagger =' . $user->id .
-                             ' AND profile_list.private = true) )');   
+                             ' AND profile_list.private = true) )');
 
             $ptags->orderBy('profile_list.modified DESC');
             $ptags->find();