From a12474a99d0322123b1c8318dfa609d5d5392c7f Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 25 Oct 2010 23:51:00 +0200 Subject: [PATCH] * i18n/L10n fixes. * translator documentation updated. * superfluous whitespace removed. --- actions/accessadminpanel.php | 25 ++++++------------- actions/accesstoken.php | 1 - actions/all.php | 17 +++++++------ actions/allrss.php | 6 ++--- actions/apiaccountratelimitstatus.php | 6 ----- actions/apiaccountupdatedeliverydevice.php | 1 - actions/apiaccountupdateprofile.php | 2 +- ...apiaccountupdateprofilebackgroundimage.php | 1 + actions/apiaccountupdateprofilecolors.php | 15 ++++------- actions/apiaccountupdateprofileimage.php | 8 ++---- actions/apiaccountverifycredentials.php | 9 ++----- actions/apiblockdestroy.php | 2 +- actions/apidirectmessage.php | 22 +++------------- actions/apidirectmessagenew.php | 4 +-- actions/apifavoritecreate.php | 2 +- actions/apifavoritedestroy.php | 10 +++----- actions/apifriendshipscreate.php | 8 +++--- actions/apifriendshipsdestroy.php | 7 +++--- actions/apifriendshipsexists.php | 7 +----- actions/apifriendshipsshow.php | 10 +++----- actions/apigroupcreate.php | 25 +++++++++++++------ actions/apigroupismember.php | 8 +++--- actions/apigroupjoin.php | 12 +++++---- actions/apigroupleave.php | 11 ++++---- actions/apigrouplist.php | 16 +++--------- actions/apigrouplistall.php | 14 +++-------- actions/apigroupmembership.php | 11 ++------ actions/apigroupshow.php | 10 ++------ actions/apihelptest.php | 9 +------ actions/newgroup.php | 13 ++++++++-- 30 files changed, 108 insertions(+), 184 deletions(-) diff --git a/actions/accessadminpanel.php b/actions/accessadminpanel.php index 73354e97a7..027c69c5e5 100644 --- a/actions/accessadminpanel.php +++ b/actions/accessadminpanel.php @@ -40,7 +40,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class AccessadminpanelAction extends AdminPanelAction { /** @@ -48,10 +47,9 @@ class AccessadminpanelAction extends AdminPanelAction * * @return string page title */ - function title() { - // TRANS: Page title + // TRANS: Page title for Access admin panel that allows configuring site access. return _('Access'); } @@ -60,10 +58,9 @@ class AccessadminpanelAction extends AdminPanelAction * * @return string instructions */ - function getInstructions() { - // TRANS: Page notice + // TRANS: Page notice. return _('Site access settings'); } @@ -72,7 +69,6 @@ class AccessadminpanelAction extends AdminPanelAction * * @return void */ - function showForm() { $form = new AccessAdminPanelForm($this); @@ -85,7 +81,6 @@ class AccessadminpanelAction extends AdminPanelAction * * @return void */ - function saveSettings() { static $booleans = array('site' => array('private', 'inviteonly', 'closed')); @@ -110,7 +105,6 @@ class AccessadminpanelAction extends AdminPanelAction return; } - } class AccessAdminPanelForm extends AdminForm @@ -120,7 +114,6 @@ class AccessAdminPanelForm extends AdminForm * * @return int ID of the form */ - function id() { return 'form_site_admin_panel'; @@ -131,7 +124,6 @@ class AccessAdminPanelForm extends AdminForm * * @return string class of the form */ - function formClass() { return 'form_settings'; @@ -142,7 +134,6 @@ class AccessAdminPanelForm extends AdminForm * * @return string URL of the action */ - function action() { return common_local_url('accessadminpanel'); @@ -153,7 +144,6 @@ class AccessAdminPanelForm extends AdminForm * * @return void */ - function formData() { $this->out->elementStart('fieldset', array('id' => 'settings_admin_access')); @@ -161,7 +151,7 @@ class AccessAdminPanelForm extends AdminForm $this->out->element('legend', null, _('Registration')); $this->out->elementStart('ul', 'form_data'); $this->li(); - // TRANS: Checkbox instructions for admin setting "Private" + // TRANS: Checkbox instructions for admin setting "Private". $instructions = _('Prohibit anonymous users (not logged in) from viewing site?'); // TRANS: Checkbox label for prohibiting anonymous users from viewing site. $this->out->checkbox('private', _m('LABEL', 'Private'), @@ -170,7 +160,7 @@ class AccessAdminPanelForm extends AdminForm $this->unli(); $this->li(); - // TRANS: Checkbox instructions for admin setting "Invite only" + // TRANS: Checkbox instructions for admin setting "Invite only". $instructions = _('Make registration invitation only.'); // TRANS: Checkbox label for configuring site as invite only. $this->out->checkbox('inviteonly', _('Invite only'), @@ -179,7 +169,7 @@ class AccessAdminPanelForm extends AdminForm $this->unli(); $this->li(); - // TRANS: Checkbox instructions for admin setting "Closed" (no new registrations) + // TRANS: Checkbox instructions for admin setting "Closed" (no new registrations). $instructions = _('Disable new registrations.'); // TRANS: Checkbox label for disabling new user registrations. $this->out->checkbox('closed', _('Closed'), @@ -195,12 +185,11 @@ class AccessAdminPanelForm extends AdminForm * * @return void */ - function formActions() { - // TRANS: Title / tooltip for button to save access settings in site admin panel + // TRANS: Title for button to save access settings in site admin panel. $title = _('Save access settings'); + // TRANS: Tooltip for button to save access settings in site admin panel. $this->out->submit('submit', _m('BUTTON', 'Save'), 'submit', null, $title); } - } diff --git a/actions/accesstoken.php b/actions/accesstoken.php index 76bd40473a..bfb771b0b3 100644 --- a/actions/accesstoken.php +++ b/actions/accesstoken.php @@ -67,4 +67,3 @@ class AccesstokenAction extends Action } } } -?> diff --git a/actions/all.php b/actions/all.php index b65335abcd..dc08592faf 100644 --- a/actions/all.php +++ b/actions/all.php @@ -64,7 +64,7 @@ class AllAction extends ProfileAction } if ($this->page > 1 && $this->notice->N == 0) { - // TRANS: Server error when page not found (404) + // TRANS: Server error when page not found (404). $this->serverError(_('No such page.'), $code = 404); } @@ -76,6 +76,7 @@ class AllAction extends ProfileAction parent::handle($args); if (!$this->user) { + // TRANS: Client error when user not found for an action. $this->clientError(_('No such user.')); return; } @@ -103,7 +104,7 @@ class AllAction extends ProfileAction 'nickname' => $this->user->nickname) ), - // TRANS: %s is user nickname + // TRANS: %s is user nickname. sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)), new Feed(Feed::RSS2, common_local_url( @@ -112,7 +113,7 @@ class AllAction extends ProfileAction 'id' => $this->user->nickname ) ), - // TRANS: %s is user nickname + // TRANS: %s is user nickname. sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)), new Feed(Feed::ATOM, common_local_url( @@ -121,7 +122,7 @@ class AllAction extends ProfileAction 'id' => $this->user->nickname ) ), - // TRANS: %s is user nickname + // TRANS: %s is user nickname. sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname)) ); } @@ -134,7 +135,7 @@ class AllAction extends ProfileAction function showEmptyListMessage() { - // TRANS: %s is user nickname + // TRANS: Empty list message. %s is a user nickname. $message = sprintf(_('This is the timeline for %s and friends but no one has posted anything yet.'), $this->user->nickname) . ' '; if (common_logged_in()) { @@ -144,7 +145,7 @@ class AllAction extends ProfileAction // TRANS: This message contains Markdown links. Keep "](" together. $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.'); } else { - // TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" + // TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@". // TRANS: This message contains Markdown links. Keep "](" together. $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from their profile or [post something to them](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); } @@ -183,10 +184,10 @@ class AllAction extends ProfileAction { $user = common_current_user(); if ($user && ($user->id == $this->user->id)) { - // TRANS: H1 text + // TRANS: H1 text for page when viewing a list for self. $this->element('h1', null, _("You and friends")); } else { - // TRANS: H1 text. %s is a user nickname + // TRANS: H1 text for page. %s is a user nickname. $this->element('h1', null, sprintf(_('%s and friends'), $this->user->nickname)); } } diff --git a/actions/allrss.php b/actions/allrss.php index 7df0b1ef7c..d398c8a6ad 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -1,5 +1,4 @@ user = User::staticGet('nickname', $nickname); if (!$this->user) { + // TRANS: Client error when user not found for an rss related action. $this->clientError(_('No such user.')); return false; } else { @@ -127,7 +126,7 @@ class AllrssAction extends Rss10Action * Get image. * * @return string user avatar URL or null - */ + */ function getImage() { $user = $this->user; @@ -139,4 +138,3 @@ class AllrssAction extends Rss10Action return $avatar ? $avatar->url : null; } } - diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php index e2dff2db94..8d7f89eadc 100644 --- a/actions/apiaccountratelimitstatus.php +++ b/actions/apiaccountratelimitstatus.php @@ -49,10 +49,8 @@ require_once INSTALLDIR . '/lib/apibareauth.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 ApiAccountRateLimitStatusAction extends ApiBareAuthAction { - /** * Handle the request * @@ -62,7 +60,6 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -119,11 +116,8 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction * * @return boolean is read only action? */ - function isReadOnly($args) { return true; } - } - diff --git a/actions/apiaccountupdatedeliverydevice.php b/actions/apiaccountupdatedeliverydevice.php index a7342a94f3..ec87c4c953 100644 --- a/actions/apiaccountupdatedeliverydevice.php +++ b/actions/apiaccountupdatedeliverydevice.php @@ -53,7 +53,6 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ function prepare($args) { diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php index aea10e33e3..163dac42d8 100644 --- a/actions/apiaccountupdateprofile.php +++ b/actions/apiaccountupdateprofile.php @@ -51,7 +51,6 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ function prepare($args) { @@ -91,6 +90,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( + // TRANS: Client error displayed when trying to handle an unknown API method. _('API method not found.'), 404, $this->format diff --git a/actions/apiaccountupdateprofilebackgroundimage.php b/actions/apiaccountupdateprofilebackgroundimage.php index 87af962d21..badd8db002 100644 --- a/actions/apiaccountupdateprofilebackgroundimage.php +++ b/actions/apiaccountupdateprofilebackgroundimage.php @@ -114,6 +114,7 @@ class ApiAccountUpdateProfileBackgroundImageAction extends ApiAuthAction } if (empty($this->user)) { + // TRANS: Client error when user not found updating a profile background image. $this->clientError(_('No such user.'), 404, $this->format); return; } diff --git a/actions/apiaccountupdateprofilecolors.php b/actions/apiaccountupdateprofilecolors.php index 9e07d80de3..109fbf959e 100644 --- a/actions/apiaccountupdateprofilecolors.php +++ b/actions/apiaccountupdateprofilecolors.php @@ -43,10 +43,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 ApiAccountUpdateProfileColorsAction extends ApiAuthAction { - var $profile_background_color = null; var $profile_text_color = null; var $profile_link_color = null; @@ -59,9 +57,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -100,7 +96,6 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -116,6 +111,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( + // TRANS: Client error displayed trying to execute an unknown API method updating profile colours. _('API method not found.'), 404, $this->format @@ -126,7 +122,6 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction $design = $this->user->getDesign(); if (!empty($design)) { - $original = clone($design); try { @@ -140,12 +135,11 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction if ($result === false) { common_log_db_error($design, 'UPDATE', __FILE__); + // TRANS: Client error displayed when a database error occurs updating profile colours. $this->clientError(_('Could not update your design.')); return; } - } else { - $this->user->query('BEGIN'); // save new design @@ -162,6 +156,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction if (empty($id)) { common_log_db_error($id, 'INSERT', __FILE__); + // TRANS: Client error displayed when a database error occurs inserting profile colours. $this->clientError(_('Unable to save your design settings.')); return; } @@ -172,6 +167,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction if (empty($result)) { common_log_db_error($original, 'UPDATE', __FILE__); + // TRANS: Client error displayed when a database error occurs updating profile colours. $this->clientError(_('Unable to save your design settings.')); $this->user->query('ROLLBACK'); return; @@ -183,6 +179,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction $profile = $this->user->getProfile(); if (empty($profile)) { + // TRANS: Client error displayed a user has no profile updating profile colours. $this->clientError(_('User has no profile.')); return; } @@ -207,7 +204,6 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction * * @return void */ - function setColors($design) { $bgcolor = empty($this->profile_background_color) ? @@ -243,5 +239,4 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction return true; } - } diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php index 1f38bd2204..f2886509d7 100644 --- a/actions/apiaccountupdateprofileimage.php +++ b/actions/apiaccountupdateprofileimage.php @@ -43,19 +43,15 @@ 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 ApiAccountUpdateProfileImageAction extends ApiAuthAction { - /** * Take arguments for running * * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -74,7 +70,6 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -105,6 +100,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction } if (empty($this->user)) { + // TRANS: Client error displayed updating profile image without having a user object. $this->clientError(_('No such user.'), 404, $this->format); return; } @@ -130,6 +126,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction $profile = $this->user->getProfile(); if (empty($profile)) { + // TRANS: Client error displayed if a user profile could not be found updating a profile image. $this->clientError(_('User has no profile.')); return; } @@ -150,5 +147,4 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction $this->endDocument('json'); } } - } diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php index 79416e9b26..26d4e2fc5c 100644 --- a/actions/apiaccountverifycredentials.php +++ b/actions/apiaccountverifycredentials.php @@ -48,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 ApiAccountVerifyCredentialsAction extends ApiAuthAction { - /** * Handle the request * @@ -61,12 +59,12 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); if (!in_array($this->format, array('xml', 'json'))) { + // TRANS: Client error displayed trying to execute an unknown API method verifying user credentials. $this->clientError(_('API method not found.'), $code = 404); return; } @@ -91,12 +89,9 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction * @param array $args other arguments * * @return boolean true - * - **/ - + */ function isReadOnly($args) { return true; } - } diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php index b699077849..7dd0859e9c 100644 --- a/actions/apiblockdestroy.php +++ b/actions/apiblockdestroy.php @@ -55,7 +55,6 @@ class ApiBlockDestroyAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ function prepare($args) { @@ -91,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; } diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php index 4e2ec5eb08..e072e27b83 100644 --- a/actions/apidirectmessage.php +++ b/actions/apidirectmessage.php @@ -48,7 +48,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 ApiDirectMessageAction extends ApiAuthAction { var $messages = null; @@ -64,9 +63,7 @@ class ApiDirectMessageAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -87,12 +84,12 @@ class ApiDirectMessageAction extends ApiAuthAction // Action was called by /api/direct_messages/sent.format $this->title = sprintf( - // TRANS: %s is a user nickname. + // TRANS: Title. %s is a user nickname. _("Direct messages from %s"), $this->user->nickname ); $this->subtitle = sprintf( - // TRANS: %s is a user nickname. + // TRANS: Subtitle. %s is a user nickname. _("All the direct messages sent from %s"), $this->user->nickname ); @@ -101,12 +98,12 @@ class ApiDirectMessageAction extends ApiAuthAction $this->id = "tag:$taguribase:SentDirectMessages:" . $this->user->id; } else { $this->title = sprintf( - // TRANS: %s is a user nickname. + // TRANS: Title. %s is a user nickname. _("Direct messages to %s"), $this->user->nickname ); $this->subtitle = sprintf( - // TRANS: %s is a user nickname. + // TRANS: Subtitle. %s is a user nickname. _("All the direct messages sent to %s"), $this->user->nickname ); @@ -129,7 +126,6 @@ class ApiDirectMessageAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -141,7 +137,6 @@ class ApiDirectMessageAction extends ApiAuthAction * * @return void */ - function showMessages() { switch($this->format) { @@ -169,7 +164,6 @@ class ApiDirectMessageAction extends ApiAuthAction * * @return array notices */ - function getMessages() { $message = new Message(); @@ -208,7 +202,6 @@ class ApiDirectMessageAction extends ApiAuthAction * * @return boolean true */ - function isReadOnly($args) { return true; @@ -219,7 +212,6 @@ class ApiDirectMessageAction extends ApiAuthAction * * @return string datestamp of the latest notice in the stream */ - function lastModified() { if (!empty($this->messages)) { @@ -234,7 +226,6 @@ class ApiDirectMessageAction extends ApiAuthAction * * @return void */ - function showXmlDirectMessages() { $this->initDocument('xml'); @@ -255,7 +246,6 @@ class ApiDirectMessageAction extends ApiAuthAction * * @return void */ - function showJsonDirectMessages() { $this->initDocument('json'); @@ -276,7 +266,6 @@ class ApiDirectMessageAction extends ApiAuthAction * * @return void */ - function showRssDirectMessages() { $this->initDocument('rss'); @@ -311,7 +300,6 @@ class ApiDirectMessageAction extends ApiAuthAction * * @return void */ - function showAtomDirectMessages() { $this->initDocument('atom'); @@ -353,7 +341,6 @@ class ApiDirectMessageAction extends ApiAuthAction * * @return string etag */ - function etag() { if (!empty($this->messages)) { @@ -374,5 +361,4 @@ class ApiDirectMessageAction extends ApiAuthAction return null; } - } diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php index ccef57b3f8..b335a9c93e 100644 --- a/actions/apidirectmessagenew.php +++ b/actions/apidirectmessagenew.php @@ -60,7 +60,6 @@ class ApiDirectMessageNewAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ function prepare($args) { @@ -69,6 +68,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction $this->user = $this->auth_user; if (empty($this->user)) { + // TRANS: Client error when user not found for an API direct message action. $this->clientError(_('No such user.'), 404, $this->format); return; } @@ -113,7 +113,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction if (empty($this->content)) { $this->clientError( - // TRANS: Client error (406). + // TRANS: Client error displayed when no message text was submitted (406). _('No message text!'), 406, $this->format diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php index 90a29d2288..b2f6266ebf 100644 --- a/actions/apifavoritecreate.php +++ b/actions/apifavoritecreate.php @@ -58,7 +58,6 @@ class ApiFavoriteCreateAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ function prepare($args) { @@ -95,6 +94,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( + // TRANS: Client error displayed when trying to handle an unknown API method. _('API method not found.'), 404, $this->format diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php index c2e1ebafc7..f86c985dc0 100644 --- a/actions/apifavoritedestroy.php +++ b/actions/apifavoritedestroy.php @@ -48,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; /** @@ -60,9 +58,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -82,7 +78,6 @@ class ApiFavoriteDestroyAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -99,6 +94,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( + // TRANS: Client error displayed when trying to handle an unknown API method. _('API method not found.'), 404, $this->format @@ -108,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 @@ -121,6 +118,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction if (!$fave->find(true)) { $this->clientError( + // TRANS: Client error displayed when trying to remove a favourite that was not a favourite. _('That status is not a favorite.'), 403, $this->favorite @@ -133,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 @@ -148,5 +147,4 @@ class ApiFavoriteDestroyAction extends ApiAuthAction $this->show_single_json_status($this->notice); } } - } diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php index 64c857c70c..89557f8392 100644 --- a/actions/apifriendshipscreate.php +++ b/actions/apifriendshipscreate.php @@ -48,7 +48,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 ApiFriendshipsCreateAction extends ApiAuthAction { var $other = null; @@ -61,7 +60,6 @@ class ApiFriendshipsCreateAction extends ApiAuthAction * @return boolean success flag * */ - function prepare($args) { parent::prepare($args); @@ -81,7 +79,6 @@ class ApiFriendshipsCreateAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -98,6 +95,7 @@ class ApiFriendshipsCreateAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( + // TRANS: Client error displayed when trying to handle an unknown API method. _('API method not found.'), 404, $this->format @@ -107,6 +105,7 @@ class ApiFriendshipsCreateAction extends ApiAuthAction if (empty($this->other)) { $this->clientError( + // TRANS: Client error displayed when trying follow who's profile could not be found. _('Could not follow user: profile not found.'), 403, $this->format @@ -116,6 +115,8 @@ class ApiFriendshipsCreateAction extends ApiAuthAction if ($this->user->isSubscribed($this->other)) { $errmsg = sprintf( + // TRANS: Client error displayed when trying to follow a user that's already being followed. + // TRANS: %s is the nickname of the user that is already being followed. _('Could not follow user: %s is already on your list.'), $this->other->nickname ); @@ -134,5 +135,4 @@ class ApiFriendshipsCreateAction extends ApiAuthAction $this->showProfile($this->other, $this->format); $this->endDocument($this->format); } - } diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php index 21da23ef7c..a5dff08bab 100644 --- a/actions/apifriendshipsdestroy.php +++ b/actions/apifriendshipsdestroy.php @@ -48,7 +48,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 ApiFriendshipsDestroyAction extends ApiAuthAction { var $other = null; @@ -61,7 +60,6 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction * @return boolean success flag * */ - function prepare($args) { parent::prepare($args); @@ -81,7 +79,6 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -98,6 +95,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( + // TRANS: Client error displayed when trying to handle an unknown API method. _('API method not found.'), 404, $this->format @@ -107,6 +105,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction if (empty($this->other)) { $this->clientError( + // TRANS: Client error displayed when trying to unfollow a user that cannot be found. _('Could not unfollow user: User not found.'), 403, $this->format @@ -118,6 +117,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction if ($this->user->id == $this->other->id) { $this->clientError( + // TRANS: Client error displayed when trying to unfollow self. _("You cannot unfollow yourself."), 403, $this->format @@ -132,5 +132,4 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction $this->showProfile($this->other, $this->format); $this->endDocument($this->format); } - } diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php index 725178fd42..c8766633b6 100644 --- a/actions/apifriendshipsexists.php +++ b/actions/apifriendshipsexists.php @@ -47,7 +47,6 @@ require_once INSTALLDIR . '/lib/apiprivateauth.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 ApiFriendshipsExistsAction extends ApiPrivateAuthAction { var $profile_a = null; @@ -59,9 +58,7 @@ class ApiFriendshipsExistsAction extends ApiPrivateAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -81,13 +78,13 @@ class ApiFriendshipsExistsAction extends ApiPrivateAuthAction * * @return void */ - function handle($args) { parent::handle($args); if (empty($this->profile_a) || empty($this->profile_b)) { $this->clientError( + // TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists. _('Two valid IDs or screen_names must be supplied.'), 400, $this->format @@ -122,10 +119,8 @@ class ApiFriendshipsExistsAction extends ApiPrivateAuthAction * * @return boolean is read only action? */ - function isReadOnly($args) { return true; } - } diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php index f29e637137..6b069c4fcf 100644 --- a/actions/apifriendshipsshow.php +++ b/actions/apifriendshipsshow.php @@ -46,7 +46,6 @@ require_once INSTALLDIR . '/lib/apibareauth.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 ApiFriendshipsShowAction extends ApiBareAuthAction { var $source = null; @@ -58,9 +57,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -93,7 +90,6 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction * * @return boolean true or false */ - function requiresAuth() { if (common_config('site', 'private')) { @@ -119,18 +115,19 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction * * @return void */ - function handle($args) { parent::handle($args); if (!in_array($this->format, array('xml', 'json'))) { + // TRANS: Client error displayed trying to execute an unknown API method showing friendship. $this->clientError(_('API method not found.'), 404); return; } if (empty($this->source)) { $this->clientError( + // TRANS: Client error displayed when a source user could not be determined showing friendship. _('Could not determine source user.'), 404 ); @@ -139,6 +136,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction if (empty($this->target)) { $this->clientError( + // TRANS: Client error displayed when a target user could not be determined showing friendship. _('Could not find target user.'), 404 ); @@ -161,7 +159,6 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction default: break; } - } /** @@ -178,5 +175,4 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction { return true; } - } diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php index 1608e030b8..54875a7188 100644 --- a/actions/apigroupcreate.php +++ b/actions/apigroupcreate.php @@ -66,9 +66,7 @@ class ApiGroupCreateAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -150,7 +148,6 @@ class ApiGroupCreateAction extends ApiAuthAction * * @return void */ - function validateParams() { $valid = Validate::string( @@ -218,7 +215,11 @@ class ApiGroupCreateAction extends ApiAuthAction } elseif (User_group::descriptionTooLong($this->description)) { $this->clientError( sprintf( - _('Description is too long (max %d chars).'), + // TRANS: Client error shown when providing too long a description during group creation. + // TRANS: %d is the maximum number of allowed characters. + _m('Description is too long (maximum %d character).', + 'Description is too long (maximum %d characters).', + User_group::maxDescription()), User_group::maxDescription() ), 403, @@ -229,6 +230,7 @@ class ApiGroupCreateAction extends ApiAuthAction !is_null($this->location) && mb_strlen($this->location) > 255) { $this->clientError( + // TRANS: Client error shown when providing too long a location during group creation. _('Location is too long (maximum 255 characters).'), 403, $this->format @@ -248,7 +250,11 @@ class ApiGroupCreateAction extends ApiAuthAction if (count($this->aliases) > common_config('group', 'maxaliases')) { $this->clientError( sprintf( - _('Too many aliases! Maximum %d.'), + // TRANS: Client error shown when providing too many aliases during group creation. + // TRANS: %d is the maximum number of allowed aliases. + _m('Too many aliases! Maximum %d allowed.', + 'Too many aliases! Maximum %d allowed.', + common_config('group', 'maxaliases')), common_config('group', 'maxaliases') ), 403, @@ -269,6 +275,8 @@ class ApiGroupCreateAction extends ApiAuthAction if (!$valid) { $this->clientError( + // TRANS: Client error shown when providing an invalid alias during group creation. + // TRANS: %s is the invalid alias. sprintf(_('Invalid alias: "%s".'), $alias), 403, $this->format @@ -278,6 +286,8 @@ class ApiGroupCreateAction extends ApiAuthAction if ($this->groupNicknameExists($alias)) { $this->clientError( sprintf( + // TRANS: Client error displayed when trying to use an alias during group creation that is already in use. + // TRANS: %s is the alias that is already in use. _('Alias "%s" already in use. Try another one.'), $alias ), @@ -291,6 +301,7 @@ class ApiGroupCreateAction extends ApiAuthAction if (strcmp($alias, $this->nickname) == 0) { $this->clientError( + // TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname. _('Alias can\'t be the same as nickname.'), 403, $this->format @@ -299,7 +310,7 @@ class ApiGroupCreateAction extends ApiAuthAction } } - // Evarything looks OK + // Everything looks OK return true; } @@ -311,7 +322,6 @@ class ApiGroupCreateAction extends ApiAuthAction * * @return boolean true or false */ - function groupNicknameExists($nickname) { $local = Local_group::staticGet('nickname', $nickname); @@ -328,5 +338,4 @@ class ApiGroupCreateAction extends ApiAuthAction return false; } - } diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php index eaa4769f3e..8d31c65ddb 100644 --- a/actions/apigroupismember.php +++ b/actions/apigroupismember.php @@ -49,7 +49,6 @@ require_once INSTALLDIR . '/lib/apibareauth.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 ApiGroupIsMemberAction extends ApiBareAuthAction { var $group = null; @@ -60,7 +59,6 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ function prepare($args) @@ -82,17 +80,18 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction * * @return void */ - function handle($args) { parent::handle($args); if (empty($this->user)) { + // TRANS: Client error displayed when checking group membership for a non-existing user. $this->clientError(_('No such user.'), 404, $this->format); return; } if (empty($this->group)) { + // TRANS: Client error displayed when checking group membership for a non-existing group. $this->clientError(_('Group not found.'), 404, $this->format); return false; } @@ -112,6 +111,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction break; default: $this->clientError( + // TRANS: Client error displayed trying to execute an unknown API method showing group membership. _('API method not found.'), 400, $this->format @@ -129,10 +129,8 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction * * @return boolean is read only action? */ - function isReadOnly($args) { return true; } - } diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php index a0c069974b..345fed2215 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; } } - } diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php index c838f6c878..0ceb3523c8 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.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 ApiGroupLeaveAction extends ApiAuthAction { var $group = null; @@ -60,9 +59,7 @@ class ApiGroupLeaveAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -82,7 +79,6 @@ class ApiGroupLeaveAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -98,11 +94,13 @@ class ApiGroupLeaveAction extends ApiAuthAction } if (empty($this->user)) { + // TRANS: Client error displayed when trying to have a non-existing user leave a group. $this->clientError(_('No such user.'), 404, $this->format); return; } if (empty($this->group)) { + // TRANS: Client error displayed when trying to leave a group that does not exist. $this->clientError(_('Group not found.'), 404, $this->format); return false; } @@ -113,6 +111,7 @@ class ApiGroupLeaveAction extends ApiAuthAction $member->profile_id = $this->auth_user->id; if (!$member->find(true)) { + // TRANS: Server error displayed when trying to leave a group the user is not a member of. $this->serverError(_('You are not a member of this group.')); return; } @@ -123,6 +122,8 @@ class ApiGroupLeaveAction extends ApiAuthAction common_log_db_error($member, 'DELETE', __FILE__); $this->serverError( sprintf( + // TRANS: Server error displayed when leaving a group fails. + // TRANS: %1$s is a user nickname, $2$s is a group nickname. _('Could not remove user %1$s from group %2$s.'), $this->user->nickname, $this->group->nickname @@ -140,6 +141,7 @@ class ApiGroupLeaveAction extends ApiAuthAction break; default: $this->clientError( + // TRANS: Client error displayed trying to execute an unknown API method leaving a group. _('API method not found.'), 404, $this->format @@ -147,5 +149,4 @@ class ApiGroupLeaveAction extends ApiAuthAction break; } } - } diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php index 319a1e424d..1f6d44363f 100644 --- a/actions/apigrouplist.php +++ b/actions/apigrouplist.php @@ -49,7 +49,6 @@ require_once INSTALLDIR . '/lib/apibareauth.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 ApiGroupListAction extends ApiBareAuthAction { var $groups = null; @@ -60,9 +59,7 @@ class ApiGroupListAction extends ApiBareAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -88,13 +85,12 @@ class ApiGroupListAction extends ApiBareAuthAction * * @return void */ - function handle($args) { parent::handle($args); $sitename = common_config('site', 'name'); - // TRANS: %s is a user name + // TRANS: Used as title in check for group membership. %s is a user name. $title = sprintf(_("%s's groups"), $this->user->nickname); $taguribase = TagURI::base(); $id = "tag:$taguribase:Groups"; @@ -104,8 +100,8 @@ class ApiGroupListAction extends ApiBareAuthAction ); $subtitle = sprintf( - // TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s - _("%1\$s groups %2\$s is a member of."), + // TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name. + _('%1$s groups %2$s is a member of.'), $sitename, $this->user->nickname ); @@ -134,13 +130,13 @@ class ApiGroupListAction extends ApiBareAuthAction break; default: $this->clientError( + // TRANS: Client error displayed trying to execute an unknown API method checking group membership. _('API method not found.'), 404, $this->format ); break; } - } /** @@ -148,7 +144,6 @@ class ApiGroupListAction extends ApiBareAuthAction * * @return array groups */ - function getGroups() { $groups = array(); @@ -174,7 +169,6 @@ class ApiGroupListAction extends ApiBareAuthAction * * @return boolean true */ - function isReadOnly($args) { return true; @@ -203,7 +197,6 @@ class ApiGroupListAction extends ApiBareAuthAction * * @return string etag */ - function etag() { if (!empty($this->groups) && (count($this->groups) > 0)) { @@ -224,5 +217,4 @@ class ApiGroupListAction extends ApiBareAuthAction return null; } - } diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php index cc7cd901dc..d05baa0992 100644 --- a/actions/apigrouplistall.php +++ b/actions/apigrouplistall.php @@ -49,7 +49,6 @@ require_once INSTALLDIR . '/lib/apiprivateauth.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 ApiGroupListAllAction extends ApiPrivateAuthAction { var $groups = null; @@ -60,9 +59,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -82,17 +79,17 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction * * @return void */ - function handle($args) { parent::handle($args); $sitename = common_config('site', 'name'); - // TRANS: Message is used as a title. %s is a site name. + // TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name. $title = sprintf(_("%s groups"), $sitename); $taguribase = TagURI::base(); $id = "tag:$taguribase:Groups"; $link = common_local_url('groups'); + // TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name. $subtitle = sprintf(_("groups on %s"), $sitename); switch($this->format) { @@ -119,13 +116,13 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction break; default: $this->clientError( + // TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups. _('API method not found.'), 404, $this->format ); break; } - } /** @@ -133,7 +130,6 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction * * @return array groups */ - function getGroups() { $qry = 'SELECT user_group.* '. @@ -165,7 +161,6 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction * * @return boolean true */ - function isReadOnly($args) { return true; @@ -176,7 +171,6 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction * * @return string datestamp of the site's latest group */ - function lastModified() { if (!empty($this->groups) && (count($this->groups) > 0)) { @@ -194,7 +188,6 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction * * @return string etag */ - function etag() { if (!empty($this->groups) && (count($this->groups) > 0)) { @@ -214,5 +207,4 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction return null; } - } diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php index b7f3064b5a..99ac965fa1 100644 --- a/actions/apigroupmembership.php +++ b/actions/apigroupmembership.php @@ -49,7 +49,6 @@ require_once INSTALLDIR . '/lib/apiprivateauth.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 ApiGroupMembershipAction extends ApiPrivateAuthAction { var $group = null; @@ -61,9 +60,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -83,12 +80,12 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction * * @return void */ - function handle($args) { parent::handle($args); if (empty($this->group)) { + // TRANS: Client error displayed trying to show group membership on a non-existing group. $this->clientError(_('Group not found.'), 404, $this->format); return false; } @@ -104,6 +101,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction break; default: $this->clientError( + // TRANS: Client error displayed trying to execute an unknown API method showing group membership. _('API method not found.'), 404, $this->format @@ -117,7 +115,6 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction * * @return array $profiles list of profiles */ - function getProfiles() { $profiles = array(); @@ -143,7 +140,6 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction * * @return boolean true */ - function isReadOnly($args) { return true; @@ -154,7 +150,6 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction * * @return string datestamp of the lastest profile in the group */ - function lastModified() { if (!empty($this->profiles) && (count($this->profiles) > 0)) { @@ -173,7 +168,6 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction * * @return string etag */ - function etag() { if (!empty($this->profiles) && (count($this->profiles) > 0)) { @@ -194,5 +188,4 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction return null; } - } diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php index 9b90e6b383..471aa141f9 100644 --- a/actions/apigroupshow.php +++ b/actions/apigroupshow.php @@ -50,7 +50,6 @@ require_once INSTALLDIR . '/lib/apiprivateauth.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 ApiGroupShowAction extends ApiPrivateAuthAction { var $group = null; @@ -61,9 +60,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -80,6 +77,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction common_redirect(common_local_url('ApiGroupShow', $args), 301); } else { $this->clientError( + // TRANS: Client error displayed when trying to show a group that could not be found. _('Group not found.'), 404, $this->format @@ -100,7 +98,6 @@ class ApiGroupShowAction extends ApiPrivateAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -113,6 +110,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction $this->showSingleJsonGroup($this->group); break; default: + // TRANS: Client error displayed trying to execute an unknown API method showing a group. $this->clientError(_('API method not found.'), 404, $this->format); break; } @@ -123,7 +121,6 @@ class ApiGroupShowAction extends ApiPrivateAuthAction * * @return string datestamp of the latest notice in the stream */ - function lastModified() { if (!empty($this->group)) { @@ -141,7 +138,6 @@ class ApiGroupShowAction extends ApiPrivateAuthAction * * @return string etag */ - function etag() { if (!empty($this->group)) { @@ -169,10 +165,8 @@ class ApiGroupShowAction extends ApiPrivateAuthAction * * @return boolean is read only action? */ - function isReadOnly($args) { return true; } - } diff --git a/actions/apihelptest.php b/actions/apihelptest.php index d0e9e4926f..fbe5f12784 100644 --- a/actions/apihelptest.php +++ b/actions/apihelptest.php @@ -44,19 +44,15 @@ require_once INSTALLDIR . '/lib/apiprivateauth.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 ApiHelpTestAction extends ApiPrivateAuthAction { - /** * Take arguments for running * * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -70,7 +66,6 @@ class ApiHelpTestAction extends ApiPrivateAuthAction * * @return void */ - function handle($args) { parent::handle($args); @@ -85,6 +80,7 @@ class ApiHelpTestAction extends ApiPrivateAuthAction $this->endDocument('json'); } else { $this->clientError( + // TRANS: Client error displayed trying to execute an unknown API method testing API connectivity. _('API method not found.'), 404, $this->format @@ -101,11 +97,8 @@ class ApiHelpTestAction extends ApiPrivateAuthAction * * @return boolean is read only action? */ - function isReadOnly($args) { return true; } - } - diff --git a/actions/newgroup.php b/actions/newgroup.php index ebfe9b599d..2951920362 100644 --- a/actions/newgroup.php +++ b/actions/newgroup.php @@ -142,7 +142,12 @@ class NewgroupAction extends Action $this->showForm(_('Full name is too long (maximum 255 characters).')); return; } else if (User_group::descriptionTooLong($description)) { - $this->showForm(sprintf(_('description is too long (max %d chars).'), User_group::maxDescription())); + // TRANS: Form validation error creating a new group because the description is too long. + // TRANS: %d is the maximum number of allowed characters. + $this->showForm(sprintf(_m('Description is too long (maximum %d character).', + 'Description is too long (maximum %d characters).', + User_group::maxDescription(), + User_group::maxDescription())); return; } else if (!is_null($location) && mb_strlen($location) > 255) { $this->showForm(_('Location is too long (maximum 255 characters).')); @@ -156,7 +161,11 @@ class NewgroupAction extends Action } if (count($aliases) > common_config('group', 'maxaliases')) { - $this->showForm(sprintf(_('Too many aliases! Maximum %d.'), + // TRANS: Client error shown when providing too many aliases during group creation. + // TRANS: %d is the maximum number of allowed aliases. + $this->showForm(sprintf(_m('Too many aliases! Maximum %d allowed.', + 'Too many aliases! Maximum %d allowed.', + common_config('group', 'maxaliases')), common_config('group', 'maxaliases'))); return; }