Merge branch '0.9.x' into 1.0.x

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

diff --git a/actions/apiaccountupdatedeliverydevice.php b/actions/apiaccountupdatedeliverydevice.php
index e732e23560d6b323e0c1af295e2981e35b2e9dee..d5be6dc6528cb77ab36c9d4e828f3ad5de310d95 100644 (file)
--- a/actions/apiaccountupdatedeliverydevice.php
+++ b/actions/apiaccountupdatedeliverydevice.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
 {
     /**
@@ -56,7 +55,6 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
      * @return boolean success flag
      *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -76,7 +74,6 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -92,6 +89,7 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
+                // TRANS: Client error displayed handling a non-existing API method.
                 _('API method not found.'),
                 404,
                 $this->format
@@ -102,16 +100,14 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
         // Note: Twitter no longer supports IM
 
         if (!in_array(strtolower($this->device), array('sms', 'im', 'none'))) {
-            $this->clientError(
-                _(
-                    'You must specify a parameter named ' .
-                    '\'device\' with a value of one of: sms, im, none.'
-                )
-            );
+            // TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
+            $this->clientError(_( 'You must specify a parameter named ' .
+                                  '\'device\' with a value of one of: sms, im, none.' ));
             return;
         }
 
         if (empty($this->user)) {
+            // TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
             $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
@@ -137,6 +133,7 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
 
         if ($result === false) {
             common_log_db_error($this->user, 'UPDATE', __FILE__);
+            // TRANS: Server error displayed when a user's delivery device cannot be updated.
             $this->serverError(_('Could not update user.'));
             return;
         }
@@ -161,5 +158,4 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
             $this->endDocument('json');
         }
     }
-
 }