Merge branch 'master' into testing

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

diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php
index 789dcbe921d7034294d0b7327927d78dbce45b03..9883bd3657dc8170a9f6b1910917711629acb9cc 100644 (file)
--- a/actions/peopletagsforuser.php
+++ b/actions/peopletagsforuser.php
@@ -46,11 +46,11 @@ class PeopletagsforuserAction extends OwnerDesignAction
     function title()
     {
         if ($this->page == 1) {
-            // Page title. %s is a tagged user's nickname.
-            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 {
-            // Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-            return sprintf(_('People tags for %1$s, page %2$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);
         }
     }
 
@@ -83,7 +83,7 @@ class PeopletagsforuserAction extends OwnerDesignAction
         $this->tagged = $this->user->getProfile();
 
         if (!$this->tagged) {
-            // TRANS: Server error displayed when a user has no profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }
@@ -102,11 +102,11 @@ class PeopletagsforuserAction extends OwnerDesignAction
     function showAnonymousMessage()
     {
         $notice =
-          // TRANS: Message displayed for anonymous users on page that displays people tags for a user.
+          // 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 people tags for **%s**. ' .
-                    'People tags are how you sort similar ' .
+          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. ' .
@@ -117,27 +117,6 @@ class PeopletagsforuserAction extends OwnerDesignAction
         $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();
-        // TRANS: Page notice.
-        $text = ($this->tagged->id == @$user->id) ? _('People tags by you') :
-                // TRANS: Page notice. %s is a tagger's nickname.
-                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.
@@ -159,15 +138,27 @@ class PeopletagsforuserAction extends OwnerDesignAction
 
     function showEmptyListMessage()
     {
-        // TRANS: Message displayed on page that displays people tags for a user when there are none.
+        // 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 tagger nickname.
-        $message = sprintf(_('%s has not been [tagged](%%%%doc.tags%%%%) by anyone yet.'), $this->tagged->nickname);
+        // 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