Merge branch 'at-mention-url' into 'master'

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

diff --git a/actions/peopletagsubscribers.php b/actions/peopletagsubscribers.php
index 1f2feeca29579513256e5fbdde0a02e48244a80c..589d49caa3be8469eddc6c3b7ba456039bf482c8 100644 (file)
--- a/actions/peopletagsubscribers.php
+++ b/actions/peopletagsubscribers.php
@@ -22,7 +22,7 @@
  * @category  Group
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -42,8 +42,7 @@ require_once(INSTALLDIR.'/lib/profilelist.php');
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
-class PeopletagsubscribersAction extends OwnerDesignAction
+class PeopletagsubscribersAction extends Action
 {
     var $page = null;
     var $peopletag = null;
@@ -59,7 +58,12 @@ class PeopletagsubscribersAction extends OwnerDesignAction
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-        $tagger_arg = $this->arg('tagger');
+        if (common_config('singleuser', 'enabled')) {
+            $tagger_arg = User::singleUserNickname();
+        } else {
+            $tagger_arg = $this->arg('tagger');
+        }
+
         $tag_arg = $this->arg('tag');
         $tagger = common_canonical_nickname($tagger_arg);
         $tag = common_canonical_tag($tag_arg);
@@ -72,27 +76,26 @@ class PeopletagsubscribersAction extends OwnerDesignAction
                 $args['page'] = $this->page;
             }
             common_redirect(common_local_url('peopletagged', $args), 301);
-            return false;
         }
 
         if (!$tagger) {
+            // TRANS: Client error displayed when a tagger is expected but not provided.
             $this->clientError(_('No tagger.'), 404);
-            return false;
         }
 
-        $user = User::staticGet('nickname', $tagger);
+        $user = User::getKV('nickname', $tagger);
 
         if (!$user) {
+            // TRANS: Client error displayed trying to perform an action related to a non-existing user.
             $this->clientError(_('No such user.'), 404);
-            return false;
         }
 
         $this->tagger = $user->getProfile();
         $this->peopletag = Profile_list::pkeyGet(array('tagger' => $user->id, 'tag' => $tag));
 
         if (!$this->peopletag) {
-            $this->clientError(_('No such peopletag.'), 404);
-            return false;
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'), 404);
         }
 
         return true;
@@ -101,10 +104,14 @@ class PeopletagsubscribersAction extends OwnerDesignAction
     function title()
     {
         if ($this->page == 1) {
-            return sprintf(_('Subscribers of people tagged %s by %s'),
+            // TRANS: Page title for list of list subscribers.
+            // TRANS: %1$s is a list, %2$s is a user nickname.
+            return sprintf(_('Subscribers to list %1$s by %2$s'),
                            $this->peopletag->tag, $this->tagger->nickname);
         } else {
-            return sprintf(_('Subscribers of people tagged %s by %s, page %d'),
+            // TRANS: Page title for list of list subscribers.
+            // TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
+            return sprintf(_('Subscribers to list %1$s by %2$s, page %3$d'),
                            $this->peopletag->tag, $this->tagger->nickname,
                            $this->page);
         }
@@ -182,6 +189,7 @@ class PeopletagSubscriberListItem extends ProfileListItem
         parent::showFullName();
         if ($this->profile->id == $this->peopletag->tagger) {
             $this->out->text(' ');
+            // TRANS: Addition in tag subscribers list for creator of a tag.
             $this->out->element('span', 'role', _('Creator'));
         }
     }
@@ -221,7 +229,7 @@ class PeopletagSubscriberListItem extends ProfileListItem
     /**
      * Fetch necessary return-to arguments for the profile forms
      * to return to this list when they're done.
-     * 
+     *
      * @return array
      */
     protected function returnToArgs()