Consolidate common code in micro-apps custom notice type display actions.

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

diff --git a/actions/newmessage.php b/actions/newmessage.php
index 25e58feab30c294ec6ef7bec4857a29de5316760..8a03aebfac4aa13c2ff1a38babe481b1006dbe74 100644 (file)
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -68,6 +68,7 @@ class NewmessageAction extends Action
 
     function title()
     {
+        // TRANS: Page title for new direct message page.
         return _('New message');
     }
 
@@ -84,6 +85,7 @@ class NewmessageAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
+            // TRANS: Client error displayed trying to create a new direct message while not logged in.
             $this->clientError(_('Not logged in.'), 403);
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->saveNewMessage();
@@ -113,12 +115,15 @@ class NewmessageAction extends Action
             $this->other = User::staticGet('id', $this->to);
 
             if (!$this->other) {
+                // TRANS: Client error displayed trying to send a direct message to a non-existing user.
                 $this->clientError(_('No such user.'), 404);
                 return false;
             }
 
             if (!$user->mutuallySubscribed($this->other)) {
-                $this->clientError(_('You can\'t send a message to this user.'), 404);
+                // TRANS: Client error displayed trying to send a direct message to a user while sender and
+                // TRANS: receiver are not subscribed to each other.
+                $this->clientError(_('You cannot send a message to this user.'), 404);
                 return false;
             }
         }
@@ -141,26 +146,34 @@ class NewmessageAction extends Action
         assert($user); // XXX: maybe an error instead...
 
         if (!$this->content) {
+            // TRANS: Form validator error displayed trying to send a direct message without content.
             $this->showForm(_('No content!'));
             return;
         } else {
-            $content_shortened = common_shorten_links($this->content);
+            $content_shortened = $user->shortenLinks($this->content);
 
             if (Message::contentTooLong($content_shortened)) {
-                $this->showForm(sprintf(_('That\'s too long. ' .
-                                          'Max message size is %d chars.'),
+                // TRANS: Form validation error displayed when message content is too long.
+                // TRANS: %d is the maximum number of characters for a message.
+                $this->showForm(sprintf(_m('That\'s too long. Maximum message size is %d character.',
+                                           'That\'s too long. Maximum message size is %d characters.',
+                                           Message::maxContent()),
                                         Message::maxContent()));
                 return;
             }
         }
 
         if (!$this->other) {
+            // TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
             $this->showForm(_('No recipient specified.'));
             return;
         } else if (!$user->mutuallySubscribed($this->other)) {
-            $this->clientError(_('You can\'t send a message to this user.'), 404);
+            // TRANS: Client error displayed trying to send a direct message to a user while sender and
+            // TRANS: receiver are not subscribed to each other.
+            $this->clientError(_('You cannot send a message to this user.'), 404);
             return;
         } else if ($user->id == $this->other->id) {
+            // TRANS: Client error displayed trying to send a direct message to self.
             $this->clientError(_('Don\'t send a message to yourself; ' .
                 'just say it to yourself quietly instead.'), 403);
             return;
@@ -178,10 +191,13 @@ class NewmessageAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Page title after sending a direct message.
             $this->element('title', null, _('Message sent'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $this->element('p', array('id' => 'command_result'),
+                // TRANS: Confirmation text after sending a direct message.
+                // TRANS: %s is the direct message recipient.
                 sprintf(_('Direct message to %s sent.'),
                     $this->other->nickname));
             $this->elementEnd('body');
@@ -207,6 +223,7 @@ class NewmessageAction extends Action
     {
         $this->startHTML('text/xml;charset=utf-8', true);
         $this->elementStart('head');
+        // TRANS: Page title after an AJAX error occurred on the "send direct message" page.
         $this->element('title', null, _('Ajax Error'));
         $this->elementEnd('head');
         $this->elementStart('body');
@@ -228,6 +245,7 @@ class NewmessageAction extends Action
             $this->xw->startDocument('1.0', 'UTF-8');
             $this->elementStart('html');
             $this->elementStart('head');
+            // TRANS: Page title on page for sending a direct message.
             $this->element('title', null, _('New message'));
             $this->elementEnd('head');
             $this->elementStart('body');