Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

[quix0rs-gnu-social.git] / lib / mailbox.php

diff --git a/lib/mailbox.php b/lib/mailbox.php
index cb56eb5904932a47c8c0b9b52582bc5741b881b3..7c6567c6c1c0511997eb84c8ddf5d3f848b582ad 100644 (file)
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @see      InboxAction
  * @see      OutboxAction
  */
-
 class MailboxAction extends CurrentUserDesignAction
 {
     var $page = null;
@@ -71,12 +70,12 @@ class MailboxAction extends CurrentUserDesignAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when trying to access a mailbox without providing a user.
             $this->clientError(_('No such user.'), 404);
             return;
         }
@@ -84,6 +83,7 @@ class MailboxAction extends CurrentUserDesignAction
         $cur = common_current_user();
 
         if (!$cur || $cur->id != $this->user->id) {
+            // TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
             $this->clientError(_('Only the user can read their own mailboxes.'),
                 403);
             return;
@@ -92,12 +92,6 @@ class MailboxAction extends CurrentUserDesignAction
         $this->showPage();
     }
 
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
-
     function showNoticeForm()
     {
         $message_form = new MessageForm($this);
@@ -120,8 +114,9 @@ class MailboxAction extends CurrentUserDesignAction
                               $this->trimmed('action'),
                               array('nickname' => $this->user->nickname));
         } else {
-            $this->element('p', 
-                           'guide', 
+            $this->element('p',
+                           'guide',
+                           // TRANS: Message displayed when there are no private messages in the inbox of a user.
                            _('You have no private messages. '.
                              'You can send private message to engage other users in conversation. '.
                              'People can send you messages for your eyes only.'));
@@ -145,7 +140,6 @@ class MailboxAction extends CurrentUserDesignAction
      *
      * @return void
      */
-
     function showPageNotice()
     {
         $instr  = $this->getInstructions();
@@ -163,7 +157,6 @@ class MailboxAction extends CurrentUserDesignAction
      *
      * @return boolean
      */
-
     function isReadOnly($args)
     {
          return true;