Merge remote branch 'gitorious/1.0.x' into 1.0.x

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

diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
index f131d1c7f2c4a9c25b6f58f7f4a5288fa2d0077f..f86c985dc0ff1c81f5053e96620ec59525603ed4 100644 (file)
--- a/actions/apifavoritedestroy.php
+++ b/actions/apifavoritedestroy.php
@@ -25,6 +25,7 @@
  * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -47,10 +48,8 @@ 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 ApiFavoriteDestroyAction extends ApiAuthAction
 {
-
     var $notice = null;
 
     /**
@@ -59,9 +58,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -81,13 +78,13 @@ class ApiFavoriteDestroyAction 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
@@ -97,7 +94,8 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
-                _('API method not found!'),
+                // TRANS: Client error displayed when trying to handle an unknown API method.
+                _('API method not found.'),
                 404,
                 $this->format
             );
@@ -106,6 +104,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
 
         if (empty($this->notice)) {
             $this->clientError(
+                // TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
                 _('No status found with that ID.'),
                 404,
                 $this->format
@@ -119,7 +118,8 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
 
         if (!$fave->find(true)) {
             $this->clientError(
-                _('That status is not a favorite!'),
+                // TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
+                _('That status is not a favorite.'),
                 403,
                 $this->favorite
             );
@@ -131,6 +131,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
         if (!$result) {
             common_log_db_error($fave, 'DELETE', __FILE__);
             $this->clientError(
+                // TRANS: Client error displayed when removing a favourite has failed.
                 _('Could not delete favorite.'),
                 404,
                 $this->format
@@ -146,5 +147,4 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
             $this->show_single_json_status($this->notice);
         }
     }
-
 }