* improve L10n consistency for English. For example proper punctuation for all button...

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

diff --git a/actions/inbox.php b/actions/inbox.php
index da27814a6e1541715d26e366cea3ef61b4b1ab9c..e9aa34317df4275e8e1f8507c7e55ddfe9339a05 100644 (file)
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * action handler for message inbox
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Message
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -37,57 +37,51 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  * action handler for message inbox
  *
  * @category Message
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      MailboxAction
  */
-
 class InboxAction extends MailboxAction
 {
+
     /**
-     * returns the title of the page
-     *
-     * @param User $user current user
-     * @param int  $page current page
-     *
-     * @return string localised title of the page
+     * Title of the page
      *
-     * @see MailboxAction::getTitle()
+     * @return string page title
      */
-
-    function getTitle($user, $page)
+    function title()
     {
-        if ($page > 1) {
-            $title = sprintf(_("Inbox for %s - page %d"), $user->nickname, $page);
+        if ($this->page > 1) {
+            // 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 {
-            $title = sprintf(_("Inbox for %s"), $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);
         }
-        return $title;
     }
 
     /**
-     * retrieve the messages for this user and this page
+     * Retrieve the messages for this user and this page
      *
      * Does a query for the right messages
      *
-     * @param User $user The current user
-     * @param int  $page The page the user is on
-     *
      * @return Message data object with stream for messages
      *
      * @see MailboxAction::getMessages()
      */
-
-    function getMessages($user, $page)
+    function getMessages()
     {
         $message = new Message();
 
-        $message->to_profile = $user->id;
-
+        $message->to_profile = $this->user->id;
         $message->orderBy('created DESC, id DESC');
-        $message->limit((($page-1)*MESSAGES_PER_PAGE), MESSAGES_PER_PAGE + 1);
+        $message->limit((($this->page - 1) * MESSAGES_PER_PAGE),
+            MESSAGES_PER_PAGE + 1);
 
         if ($message->find()) {
             return $message;
@@ -96,31 +90,40 @@ class InboxAction extends MailboxAction
         }
     }
 
+    function getMessageList($message)
+    {
+        return new InboxMessageList($this, $message);
+    }
+
     /**
-     * returns the profile we want to show with the message
-     *
-     * For inboxes, we show the sender.
-     *
-     * @param Message $message The message to get the profile for
-     *
-     * @return Profile The profile of the message sender
+     * Instructions for using this page
      *
-     * @see MailboxAction::getMessageProfile()
+     * @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.');
+    }
+}
 
-    function getMessageProfile($message)
+class InboxMessageList extends MessageList
+{
+    function newItem($message)
     {
-        return $message->getFrom();
+        return new InboxMessageListItem($this->out, $message);
     }
+}
 
+class InboxMessageListItem extends MessageListItem
+{
     /**
-     * instructions for using this page
+     * Returns the profile we want to show with the message
      *
-     * @return string localised instructions for using the page
+     * @return Profile The profile that matches the message
      */
-
-    function getInstructions()
+    function getMessageProfile()
     {
-        return _('This is your inbox, which lists your incoming private messages.');
+        return $this->message->getFrom();
     }
 }