X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Finbox.php;h=e9aa34317df4275e8e1f8507c7e55ddfe9339a05;hb=0e439117a75698629c5066d0241ab41dc07b5ee1;hp=6cb7f9e157df07a5d5862546dc3a1924051dd208;hpb=b3b3af9a2eff10c272bb213eccd3dd3060bc5830;p=quix0rs-gnu-social.git

diff --git a/actions/inbox.php b/actions/inbox.php
index 6cb7f9e157..e9aa34317d 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -43,7 +43,6 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  * @link     http://status.net/
  * @see      MailboxAction
  */
-
 class InboxAction extends MailboxAction
 {
 
@@ -52,14 +51,17 @@ class InboxAction extends MailboxAction
      *
      * @return string page title
      */
-
     function title()
     {
         if ($this->page > 1) {
-            return sprintf(_("Inbox for %s - page %d"), $this->user->nickname,
+            // TRANS: Title for all but the first page of the inbox page.
+            // TRANS: %1$s is the user's nickname, %2$s is the page number.
+            return sprintf(_('Inbox for %1$s - page %2$d'), $this->user->nickname,
                 $this->page);
         } else {
-            return sprintf(_("Inbox for %s"), $this->user->nickname);
+            // TRANS: Title for the first page of the inbox page.
+            // TRANS: %s is the user's nickname.
+            return sprintf(_('Inbox for %s'), $this->user->nickname);
         }
     }
 
@@ -72,7 +74,6 @@ class InboxAction extends MailboxAction
      *
      * @see MailboxAction::getMessages()
      */
-
     function getMessages()
     {
         $message = new Message();
@@ -89,19 +90,9 @@ class InboxAction extends MailboxAction
         }
     }
 
-    /**
-     * Returns the profile we want to show with the message
-     *
-     * For inboxes, we show the sender; for outboxes, the recipient.
-     *
-     * @param Message $message The message to get the profile for
-     *
-     * @return Profile The profile that matches the message
-     */
-
-    function getMessageProfile($message)
+    function getMessageList($message)
     {
-        return $message->getFrom();
+        return new InboxMessageList($this, $message);
     }
 
     /**
@@ -109,9 +100,30 @@ class InboxAction extends MailboxAction
      *
      * @return string localised instructions for using the page
      */
-
     function getInstructions()
     {
+        // TRANS: Instructions for user inbox page.
         return _('This is your inbox, which lists your incoming private messages.');
     }
 }
+
+class InboxMessageList extends MessageList
+{
+    function newItem($message)
+    {
+        return new InboxMessageListItem($this->out, $message);
+    }
+}
+
+class InboxMessageListItem extends MessageListItem
+{
+    /**
+     * Returns the profile we want to show with the message
+     *
+     * @return Profile The profile that matches the message
+     */
+    function getMessageProfile()
+    {
+        return $this->message->getFrom();
+    }
+}