X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fpeopletagsforuser.php;h=83122e41055ce0b22c7070d3fd35db7937222758;hb=0af75a5a2a9a62826594b7526aa7749ab7844b62;hp=73fb2256128437cc3a7dbabef30a1b94456eb3ea;hpb=5a2bab07b25443eacc7f5cfde4b9932cdb511e92;p=quix0rs-gnu-social.git

diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php
index 73fb225612..83122e4105 100644
--- a/actions/peopletagsforuser.php
+++ b/actions/peopletagsforuser.php
@@ -22,7 +22,7 @@
  * @category  Personal
  * @package   StatusNet
  * @author    Shashi Gowda <connect2shashi@gmail.com>
- * @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/
  */
@@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/peopletaglist.php';
 
-class PeopletagsforuserAction extends OwnerDesignAction
+class PeopletagsforuserAction extends Action
 {
     var $page = null;
     var $tagged = null;
@@ -46,9 +46,11 @@ class PeopletagsforuserAction extends OwnerDesignAction
     function title()
     {
         if ($this->page == 1) {
-            return sprintf(_("People tags for %s"), $this->tagged->nickname);
+            // TRANS: Page title. %s is a tagged user's nickname.
+            return sprintf(_('Lists with %s in them'), $this->tagged->nickname);
         } else {
-            return sprintf(_("People tags for %s, page %d"), $this->tagged->nickname, $this->page);
+            // TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
+            return sprintf(_('Lists with %1$s, page %2$d'), $this->tagged->nickname, $this->page);
         }
     }
 
@@ -56,7 +58,12 @@ class PeopletagsforuserAction extends OwnerDesignAction
     {
         parent::prepare($args);
 
-        $nickname_arg = $this->arg('nickname');
+        if (common_config('singleuser', 'enabled')) {
+            $nickname_arg = User::singleUserNickname();
+        } else {
+            $nickname_arg = $this->arg('nickname');
+        }
+
         $nickname = common_canonical_nickname($nickname_arg);
 
         // Permanent redirect on non-canonical nickname
@@ -70,9 +77,10 @@ class PeopletagsforuserAction extends OwnerDesignAction
             return false;
         }
 
-        $this->user = User::staticGet('nickname', $nickname);
+        $this->user = User::getKV('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed trying to perform an action related to a non-existing user.
             $this->clientError(_('No such user.'), 404);
             return false;
         }
@@ -80,6 +88,7 @@ class PeopletagsforuserAction extends OwnerDesignAction
         $this->tagged = $this->user->getProfile();
 
         if (!$this->tagged) {
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }
@@ -98,37 +107,21 @@ class PeopletagsforuserAction extends OwnerDesignAction
     function showAnonymousMessage()
     {
         $notice =
-          sprintf(_('These are people tags for **%s**. ' .
-                    'People tags are how you sort similar ' .
+          // TRANS: Message displayed for anonymous users on page that displays lists for a user.
+          // TRANS: This message contains Markdown links in the form [description](links).
+          // TRANS: %s is a tagger nickname.
+          sprintf(_('These are lists for **%s**. ' .
+                    '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 easily keep track of what they ' .
-                    'are doing by subscribing to the tag\'s timeline.' ), $this->tagged->nickname);
+                    'are doing by subscribing to the list\'s timeline.' ), $this->tagged->nickname);
         $this->elementStart('div', array('id' => 'anon_notice'));
         $this->raw(common_markup_to_html($notice));
         $this->elementEnd('div');
     }
 
-    function showPageNotice()
-    {
-        $this->elementStart('dl', 'filter_tags');
-        $this->elementStart('dd', array('id' => 'filter_tags_for',
-                                         'class' => 'child_1'));
-
-        $user = common_current_user();
-        $text = ($this->tagged->id == @$user->id) ? _('People tags by you') :
-                sprintf(_('People tags by %s'), $this->tagged->nickname);
-        $this->element('a',
-                       array('href' =>
-                             common_local_url('peopletagsbyuser',
-                                              array('nickname' => $this->tagged->nickname))),
-                           $text);
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
-    }
-
-
     function showContent()
     {
         #TODO: controls here.
@@ -150,12 +143,27 @@ class PeopletagsforuserAction extends OwnerDesignAction
 
     function showEmptyListMessage()
     {
-        $message = sprintf(_('%s has not been [tagged](%%%%doc.tags%%%%) by anyone yet.'), $this->tagged->nickname);
+        // TRANS: Message displayed on page that displays lists a user was added to when there are none.
+        // TRANS: This message contains Markdown links in the form [description](links).
+        // TRANS: %s is a user nickname.
+        $message = sprintf(_('%s has not been [listed](%%%%doc.lists%%%%) by anyone yet.'), $this->tagged->nickname);
         $this->elementStart('div', 'guide');
         $this->raw(common_markup_to_html($message));
         $this->elementEnd('div');
     }
 
+    function showObjectNav()
+    {
+        $nav = new PeopletagNav($this, $this->tagged);
+        $nav->show();
+    }
+
+    function showProfileBlock()
+    {
+        $block = new AccountProfileBlock($this, $this->tagged);
+        $block->show();
+    }
+
     function showSections()
     {
         #TODO: tags with most subscribers