Merge branch '1.0.x' into testing

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

diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php
index 0dd71d242c31e993ebaf507c8306412f0eddda01..cc281339400d1f2e033b97ea18055b7f4208e977 100644 (file)
--- 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,10 +46,10 @@ class PeopletagsforuserAction extends OwnerDesignAction
     function title()
     {
         if ($this->page == 1) {
-            // Page title. %s is a tagged user's 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.
+            // 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;
         }
@@ -138,9 +138,9 @@ class PeopletagsforuserAction extends OwnerDesignAction
 
     function showEmptyListMessage()
     {
-        // TRANS: Message displayed on page that displays lists 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.
+        // 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));