Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

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

diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 071cd9290f3743a353cb68b4a8bc2610ab8fa5d2..345fed2215e7587d582a46605f2df578fd9c2721 100644 (file)
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -26,6 +26,7 @@
  * @author    Jeffery To <jeffery.to@gmail.com>
  * @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/
  */
@@ -48,7 +49,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 ApiGroupJoinAction extends ApiAuthAction
 {
     var $group   = null;
@@ -59,9 +59,7 @@ class ApiGroupJoinAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -81,13 +79,13 @@ class ApiGroupJoinAction 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
@@ -96,17 +94,20 @@ class ApiGroupJoinAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            // TRANS: Client error displayed when trying to have a non-existing user join a group.
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
         if (empty($this->group)) {
-            $this->clientError('Group not found!', 404, $this->format);
+            // TRANS: Client error displayed when trying to join a group that does not exist.
+            $this->clientError(_('Group not found.'), 404, $this->format);
             return false;
         }
 
         if ($this->user->isMember($this->group)) {
             $this->clientError(
+                // TRANS: Server error displayed when trying to join a group the user is already a member of.
                 _('You are already a member of that group.'),
                 403,
                 $this->format
@@ -116,6 +117,7 @@ class ApiGroupJoinAction extends ApiAuthAction
 
         if (Group_block::isBlocked($this->group, $this->user->getProfile())) {
             $this->clientError(
+                // TRANS: Server error displayed when trying to join a group the user is blocked from joining.
                 _('You have been blocked from that group by the admin.'),
                 403,
                 $this->format
@@ -135,7 +137,9 @@ class ApiGroupJoinAction extends ApiAuthAction
             common_log_db_error($member, 'INSERT', __FILE__);
             $this->serverError(
                 sprintf(
-                    _('Could not join user %s to group %s.'),
+                    // TRANS: Server error displayed when joining a group fails.
+                    // TRANS: %1$s is a user nickname, $2$s is a group nickname.
+                    _('Could not join user %1$s to group %2$s.'),
                     $this->user->nickname,
                     $this->group->nickname
                 )
@@ -145,19 +149,19 @@ class ApiGroupJoinAction extends ApiAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_single_xml_group($this->group);
+            $this->showSingleXmlGroup($this->group);
             break;
         case 'json':
             $this->showSingleJsonGroup($this->group);
             break;
         default:
             $this->clientError(
-                _('API method not found!'),
+                // TRANS: Client error displayed trying to execute an unknown API method joining a group.
+                _('API method not found.'),
                 404,
                 $this->format
             );
             break;
         }
     }
-
 }