1 files changed, 29 insertions, 28 deletions

diff --git a/actions/showmessage.php b/actions/showmessage.php
index db757948b..d737f85d3 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -26,8 +26,8 @@
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
-if (!defined('STATUSNET') && !defined('LACONICA')) { 
-    exit(1); 
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
 }
 
 require_once INSTALLDIR.'/lib/mailbox.php';
@@ -36,26 +36,24 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  * Show a single message
  *
  * // XXX: It is totally weird how this works!
- * 
+ *
  * @category Personal
  * @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://status.net/
  */
-
 class ShowmessageAction extends MailboxAction
 {
     /**
      * Message object to show
      */
-
     var $message = null;
-    
+
     /**
      * The current user
      */
-    
+
     var $user = null;
 
     /**
@@ -67,17 +65,17 @@ class ShowmessageAction extends MailboxAction
      *
      * @return success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
-        
+
         $this->page = 1;
-        
+
         $id            = $this->trimmed('message');
         $this->message = Message::staticGet('id', $id);
 
         if (!$this->message) {
+            // TRANS: Client error displayed requesting a single message that does not exist.
             $this->clientError(_('No such message.'), 404);
             return false;
         }
@@ -90,40 +88,47 @@ class ShowmessageAction extends MailboxAction
     function handle($args)
     {
         Action::handle($args);
-                        
-        if ($this->user && ($this->user->id == $this->message->from_profile || 
+
+        if ($this->user && ($this->user->id == $this->message->from_profile ||
             $this->user->id == $this->message->to_profile)) {
                 $this->showPage();
         } else {
+            // TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
             $this->clientError(_('Only the sender and recipient ' .
                 'may read this message.'), 403);
             return;
         }
     }
-    
+
     function title()
-    {                        
+    {
         if ($this->user->id == $this->message->from_profile) {
             $to = $this->message->getTo();
-            return sprintf(_("Message to %1\$s on %2\$s"),
+            // @todo FIXME: Might be nice if the timestamp could be localised.
+            // TRANS: Page title for single direct message display when viewing user is the sender.
+            // TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
+            return sprintf(_('Message to %1$s on %2$s'),
                              $to->nickname,
                              common_exact_date($this->message->created));
         } else if ($this->user->id == $this->message->to_profile) {
             $from = $this->message->getFrom();
-            return sprintf(_("Message from %1\$s on %2\$s"),
+            // @todo FIXME: Might be nice if the timestamp could be localised.
+            // TRANS: Page title for single message display.
+            // TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
+            return sprintf(_('Message from %1$s on %2$s'),
                              $from->nickname,
                              common_exact_date($this->message->created));
         }
     }
-        
-    function getMessages() 
-    {    
+
+    function getMessages()
+    {
         $message     = new Message();
         $message->id = $this->message->id;
         $message->find();
         return $message;
     }
-    
+
     function getMessageProfile()
     {
         if ($this->user->id == $this->message->from_profile) {
@@ -135,23 +140,21 @@ class ShowmessageAction extends MailboxAction
             return null;
         }
     }
-    
+
     /**
      * Don't show local navigation
      *
      * @return void
      */
-
     function showLocalNavBlock()
     {
     }
-    
+
     /**
      * Don't show page notice
      *
      * @return void
      */
-
     function showPageNoticeBlock()
     {
     }
@@ -161,17 +164,15 @@ class ShowmessageAction extends MailboxAction
      *
      * @return void
      */
-
-    function showAside() 
+    function showAside()
     {
     }
- 
+
     /**
      * Don't show any instructions
      *
      * @return string
      */
-     
     function getInstructions()
     {
         return '';