Merge branch 'master' into testing

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

diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index 7ea201677e677fe2c2e0373153bc9a752db3ef7c..7dd0859e9c8a192bfc375531cc2c6d3f05d07b0c 100644 (file)
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.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 ApiBlockDestroyAction extends ApiAuthAction
 {
     var $other   = null;
@@ -56,9 +55,7 @@ class ApiBlockDestroyAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -78,13 +75,13 @@ class ApiBlockDestroyAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
             $this->clientError(
+                // TRANS: Client error. POST is a HTTP command. It should not be translated.
                 _('This method requires a POST.'),
                 400,
                 $this->format
@@ -93,6 +90,7 @@ class ApiBlockDestroyAction extends ApiAuthAction
         }
 
         if (empty($this->user) || empty($this->other)) {
+            // TRANS: Client error when user not found for an API action to remove a block for a user.
             $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
@@ -111,10 +109,8 @@ class ApiBlockDestroyAction extends ApiAuthAction
             $this->showProfile($this->other, $this->format);
             $this->endDocument($this->format);
         } else {
+            // TRANS: Server error displayed when unblocking a user has failed.
             $this->serverError(_('Unblock user failed.'));
         }
-
     }
-
 }
-