diff options
author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2010-10-25 23:51:00 +0200 |
---|---|---|
committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2010-10-28 01:21:09 +0200 |
commit | a12474a99d0322123b1c8318dfa609d5d5392c7f (patch) | |
tree | 85e97c1475acd17cce415ff80848d518ab7e4be9 /actions/apigroupjoin.php | |
parent | 60b66bdd6e3bbc083aec6126b8583714dc24b94d (diff) |
* i18n/L10n fixes.
* translator documentation updated.
* superfluous whitespace removed.
Diffstat (limited to 'actions/apigroupjoin.php')
-rw-r--r-- | actions/apigroupjoin.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php index a0c069974..345fed221 100644 --- a/actions/apigroupjoin.php +++ b/actions/apigroupjoin.php @@ -49,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; @@ -60,9 +59,7 @@ class ApiGroupJoinAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -82,7 +79,6 @@ class ApiGroupJoinAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -98,17 +94,20 @@ class ApiGroupJoinAction extends ApiAuthAction } if (empty($this->user)) { + // 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)) { + // 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 @@ -118,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 @@ -137,6 +137,8 @@ class ApiGroupJoinAction extends ApiAuthAction common_log_db_error($member, 'INSERT', __FILE__); $this->serverError( sprintf( + // 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 @@ -154,6 +156,7 @@ class ApiGroupJoinAction extends ApiAuthAction break; default: $this->clientError( + // TRANS: Client error displayed trying to execute an unknown API method joining a group. _('API method not found.'), 404, $this->format @@ -161,5 +164,4 @@ class ApiGroupJoinAction extends ApiAuthAction break; } } - } |