From b37e12ed3436e7616c491016a68342559752d178 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 5 Mar 2011 00:12:38 +0100 Subject: [PATCH] * translator documntation updated * superfluous whitespace remove * minor L10n and i18n updates --- actions/licenseadminpanel.php | 46 ++++++++++++++++++++++++++++------- actions/login.php | 17 ++++++++++++- actions/logout.php | 1 - actions/makeadmin.php | 14 +++++++++++ actions/microsummary.php | 12 +++++---- actions/newmessage.php | 19 +++++++++++++-- actions/newnotice.php | 5 ++++ actions/nudge.php | 5 +++- actions/oembed.php | 12 +++++++++ actions/opensearch.php | 2 +- 10 files changed, 113 insertions(+), 20 deletions(-) diff --git a/actions/licenseadminpanel.php b/actions/licenseadminpanel.php index 4adeb5c3c6..fda7cd4359 100644 --- a/actions/licenseadminpanel.php +++ b/actions/licenseadminpanel.php @@ -42,7 +42,6 @@ if (!defined('STATUSNET')) { */ class LicenseadminpanelAction extends AdminPanelAction { - /** * Returns the page title * @@ -62,6 +61,7 @@ class LicenseadminpanelAction extends AdminPanelAction */ function getInstructions() { + // TRANS: Form instructions for the site license admin panel. return _('License for this StatusNet site'); } @@ -131,7 +131,8 @@ class LicenseadminpanelAction extends AdminPanelAction $types = array('private', 'allrightsreserved', 'cc'); if (!in_array($values['license']['type'], $types)) { - $this->clientError(_("Invalid license selection.")); + // TRANS: Client error displayed selecting an invalid license in the license admin panel. + $this->clientError(_('Invalid license selection.')); } // Make sure the user has set an owner if the site has a private @@ -141,13 +142,15 @@ class LicenseadminpanelAction extends AdminPanelAction && empty($values['license']['owner']) ) { $this->clientError( - _("You must specify the owner of the content when using the All Rights Reserved license.") + // TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel. + _('You must specify the owner of the content when using the All Rights Reserved license.') ); } // Make sure the license title is not too long if (mb_strlen($values['license']['type']) > 255) { $this->clientError( + // TRANS: Client error displayed selecting a too long license title in the license admin panel. _('Invalid license title. Maximum length is 255 characters.') ); } @@ -160,10 +163,12 @@ class LicenseadminpanelAction extends AdminPanelAction if ($values['license']['type'] == 'cc') { if (!Validate::uri($values['license']['url'], $options)) { - $this->clientError(_("Invalid license URL.")); + // TRANS: Client error displayed specifying an invalid license URL in the license admin panel. + $this->clientError(_('Invalid license URL.')); } if (!Validate::uri($values['license']['image'], $options)) { - $this->clientError(_("Invalid license image URL.")); + // TRANS: Client error displayed specifying an invalid license image URL in the license admin panel. + $this->clientError(_('Invalid license image URL.')); } } @@ -171,7 +176,8 @@ class LicenseadminpanelAction extends AdminPanelAction if (!empty($values['license']['url'])) { if (!Validate::uri($values['license']['url'], $options)) { - $this->clientError(_("License URL must be blank or a valid URL.")); + // TRANS: Client error displayed specifying an invalid license URL in the license admin panel. + $this->clientError(_('License URL must be blank or a valid URL.')); } } @@ -179,7 +185,8 @@ class LicenseadminpanelAction extends AdminPanelAction if (!empty($values['license']['image'])) { if (!Validate::uri($values['license']['image'], $options)) { - $this->clientError(_("License image must be blank or valid URL.")); + // TRANS: Client error displayed specifying an invalid license image URL in the license admin panel. + $this->clientError(_('License image must be blank or valid URL.')); } } } @@ -229,22 +236,28 @@ class LicenseAdminPanelForm extends AdminForm $this->out->elementStart( 'fieldset', array('id' => 'settings_license-selection') ); + // TRANS: Form legend in the license admin panel. $this->out->element('legend', null, _('License selection')); $this->out->elementStart('ul', 'form_data'); $this->li(); $types = array( + // TRANS: License option in the license admin panel. 'private' => _('Private'), + // TRANS: License option in the license admin panel. 'allrightsreserved' => _('All Rights Reserved'), + // TRANS: License option in the license admin panel. 'cc' => _('Creative Commons') ); $this->out->dropdown( 'type', + // TRANS: Dropdown field label in the license admin panel. _('Type'), $types, - _('Select license'), + // TRANS: Dropdown field instructions in the license admin panel. + _('Select a license.'), false, $this->value('type', 'license') ); @@ -258,13 +271,16 @@ class LicenseAdminPanelForm extends AdminForm 'fieldset', array('id' => 'settings_license-details') ); + // TRANS: Form legend in the license admin panel. $this->out->element('legend', null, _('License details')); $this->out->elementStart('ul', 'form_data'); $this->li(); $this->input( 'owner', + // TRANS: Field label in the license admin panel. _('Owner'), + // TRANS: Field title in the license admin panel. _('Name of the owner of the site\'s content (if applicable).'), 'license' ); @@ -273,7 +289,9 @@ class LicenseAdminPanelForm extends AdminForm $this->li(); $this->input( 'title', + // TRANS: Field label in the license admin panel. _('License Title'), + // TRANS: Field title in the license admin panel. _('The title of the license.'), 'license' ); @@ -282,7 +300,9 @@ class LicenseAdminPanelForm extends AdminForm $this->li(); $this->input( 'url', + // TRANS: Field label in the license admin panel. _('License URL'), + // TRANS: Field title in the license admin panel. _('URL for more information about the license.'), 'license' ); @@ -290,7 +310,9 @@ class LicenseAdminPanelForm extends AdminForm $this->li(); $this->input( + // TRANS: Field label in the license admin panel. 'image', _('License Image URL'), + // TRANS: Field title in the license admin panel. _('URL for an image to display with the license.'), 'license' ); @@ -308,7 +330,13 @@ class LicenseAdminPanelForm extends AdminForm function formActions() { $this->out->submit( - 'submit', _('Save'), 'submit', null, _('Save license settings') + 'submit', + // TRANS: Button text in the license admin panel. + _m('BUTTON','Save'), + 'submit', + null, + // TRANS: Button title in the license admin panel. + _('Save license settings.') ); } } diff --git a/actions/login.php b/actions/login.php index 8d51a01449..768bc04cef 100644 --- a/actions/login.php +++ b/actions/login.php @@ -94,6 +94,7 @@ class LoginAction extends Action parent::handle($args); if (common_is_real_login()) { + // TRANS: Client error displayed when trying to log in while already logged in. $this->clientError(_('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->checkLogin(); @@ -122,12 +123,14 @@ class LoginAction extends Action $user = common_check_user($nickname, $password); if (!$user) { + // TRANS: Form validation error displayed when trying to log in with incorrect credentials. $this->showForm(_('Incorrect username or password.')); return; } // success! if (!common_set_user($user)) { + // TRANS: Server error displayed when during login a server error occurs. $this->serverError(_('Error setting user. You are probably not authorized.')); return; } @@ -182,6 +185,7 @@ class LoginAction extends Action */ function title() { + // TRANS: Page title for login page. return _('Login'); } @@ -219,25 +223,32 @@ class LoginAction extends Action 'class' => 'form_settings', 'action' => common_local_url('login'))); $this->elementStart('fieldset'); + // TRANS: Form legend on login page. $this->element('legend', null, _('Login to site')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); + // TRANS: Field label on login page. $this->input('nickname', _('Nickname')); $this->elementEnd('li'); $this->elementStart('li'); + // TRANS: Field label on login page. $this->password('password', _('Password')); $this->elementEnd('li'); $this->elementStart('li'); + // TRANS: Checkbox label label on login page. $this->checkbox('rememberme', _('Remember me'), false, + // TRANS: Checkbox title on login page. _('Automatically login in the future; ' . 'not for shared computers!')); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('submit', _('Login')); + // TRANS: Button text for log in on login page. + $this->submit('submit', _m('BUTTON','Login')); $this->elementEnd('fieldset'); $this->elementEnd('form'); $this->elementStart('p'); $this->element('a', array('href' => common_local_url('recoverpassword')), + // TRANS: Link text for link to "reset password" on login page. _('Lost or forgotten password?')); $this->elementEnd('p'); } @@ -256,13 +267,17 @@ class LoginAction extends Action common_get_returnto()) { // rememberme logins have to reauthenticate before // changing any profile settings (cookie-stealing protection) + // TRANS: Form instructions on login page before being able to change user settings. return _('For security reasons, please re-enter your ' . 'user name and password ' . 'before changing your settings.'); } else { + // TRANS: Form instructions on login page. $prompt = _('Login with your username and password.'); if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) { $prompt .= ' '; + // TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link). + // TRANS: %%action.register%% is a link to the registration page. $prompt .= _('Don\'t have a username yet? ' . '[Register](%%action.register%%) a new account.'); } diff --git a/actions/logout.php b/actions/logout.php index f747371225..8e903db221 100644 --- a/actions/logout.php +++ b/actions/logout.php @@ -44,7 +44,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { */ class LogoutAction extends Action { - /** * This is read only. * diff --git a/actions/makeadmin.php b/actions/makeadmin.php index 4e6e97a569..3613e1eb70 100644 --- a/actions/makeadmin.php +++ b/actions/makeadmin.php @@ -58,6 +58,7 @@ class MakeadminAction extends RedirectingAction { parent::prepare($args); if (!common_logged_in()) { + // TRANS: Client error displayed when trying to access the "make admin" page while not logged in. $this->clientError(_('Not logged in.')); return false; } @@ -68,31 +69,38 @@ class MakeadminAction extends RedirectingAction } $id = $this->trimmed('profileid'); if (empty($id)) { + // TRANS: Client error displayed when not providing a profile ID on the Make Admin page. $this->clientError(_('No profile specified.')); return false; } $this->profile = Profile::staticGet('id', $id); if (empty($this->profile)) { + // TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page. $this->clientError(_('No profile with that ID.')); return false; } $group_id = $this->trimmed('groupid'); if (empty($group_id)) { + // TRANS: Client error displayed when not providing a group ID on the Make Admin page. $this->clientError(_('No group specified.')); return false; } $this->group = User_group::staticGet('id', $group_id); if (empty($this->group)) { + // TRANS: Client error displayed when providing an invalid group ID on the Make Admin page. $this->clientError(_('No such group.')); return false; } $user = common_current_user(); if (!$user->isAdmin($this->group) && !$user->hasRight(Right::MAKEGROUPADMIN)) { + // TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin. $this->clientError(_('Only an admin can make another user an admin.'), 401); return false; } if ($this->profile->isAdmin($this->group)) { + // TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin. + // TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for. $this->clientError(sprintf(_('%1$s is already an admin for group "%2$s".'), $this->profile->getBestName(), $this->group->getBestName()), @@ -130,6 +138,9 @@ class MakeadminAction extends RedirectingAction 'profile_id' => $this->profile->id)); if (empty($member)) { + // TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails + // TRANS: because the group membership record could not be gotten. + // TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for. $this->serverError(_('Can\'t get membership record for %1$s in group %2$s.'), $this->profile->getBestName(), $this->group->getBestName()); @@ -143,6 +154,9 @@ class MakeadminAction extends RedirectingAction if (!$result) { common_log_db_error($member, 'UPDATE', __FILE__); + // TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails + // TRANS: because the group adminship record coud not be saved properly. + // TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for. $this->serverError(_('Can\'t make %1$s an admin for group %2$s.'), $this->profile->getBestName(), $this->group->getBestName()); diff --git a/actions/microsummary.php b/actions/microsummary.php index d145dc3bc7..6d47e85c68 100644 --- a/actions/microsummary.php +++ b/actions/microsummary.php @@ -46,7 +46,7 @@ class MicrosummaryAction extends Action { /** * Class handler. - * + * * @param array $args array of arguments * * @return nothing @@ -59,18 +59,20 @@ class MicrosummaryAction extends Action $user = User::staticGet('nickname', $nickname); if (!$user) { + // TRANS: Client error displayed trying to make a micro summary without providing a valid user. $this->clientError(_('No such user.'), 404); return; } - + $notice = $user->getCurrentNotice(); - + if (!$notice) { + // TRANS: Client error displayed trying to make a micro summary without providing a status. $this->clientError(_('No current status.'), 404); } - + header('Content-Type: text/plain'); - + print $user->nickname . ': ' . $notice->content; } diff --git a/actions/newmessage.php b/actions/newmessage.php index 447a00580c..8a03aebfac 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -68,6 +68,7 @@ class NewmessageAction extends Action function title() { + // TRANS: Page title for new direct message page. return _('New message'); } @@ -84,6 +85,7 @@ class NewmessageAction extends Action parent::handle($args); if (!common_logged_in()) { + // TRANS: Client error displayed trying to create a new direct message while not logged in. $this->clientError(_('Not logged in.'), 403); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->saveNewMessage(); @@ -113,12 +115,15 @@ class NewmessageAction extends Action $this->other = User::staticGet('id', $this->to); if (!$this->other) { + // TRANS: Client error displayed trying to send a direct message to a non-existing user. $this->clientError(_('No such user.'), 404); return false; } if (!$user->mutuallySubscribed($this->other)) { - $this->clientError(_('You can\'t send a message to this user.'), 404); + // TRANS: Client error displayed trying to send a direct message to a user while sender and + // TRANS: receiver are not subscribed to each other. + $this->clientError(_('You cannot send a message to this user.'), 404); return false; } } @@ -141,6 +146,7 @@ class NewmessageAction extends Action assert($user); // XXX: maybe an error instead... if (!$this->content) { + // TRANS: Form validator error displayed trying to send a direct message without content. $this->showForm(_('No content!')); return; } else { @@ -158,12 +164,16 @@ class NewmessageAction extends Action } if (!$this->other) { + // TRANS: Form validation error displayed trying to send a direct message without specifying a recipient. $this->showForm(_('No recipient specified.')); return; } else if (!$user->mutuallySubscribed($this->other)) { - $this->clientError(_('You can\'t send a message to this user.'), 404); + // TRANS: Client error displayed trying to send a direct message to a user while sender and + // TRANS: receiver are not subscribed to each other. + $this->clientError(_('You cannot send a message to this user.'), 404); return; } else if ($user->id == $this->other->id) { + // TRANS: Client error displayed trying to send a direct message to self. $this->clientError(_('Don\'t send a message to yourself; ' . 'just say it to yourself quietly instead.'), 403); return; @@ -181,10 +191,13 @@ class NewmessageAction extends Action if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); + // TRANS: Page title after sending a direct message. $this->element('title', null, _('Message sent')); $this->elementEnd('head'); $this->elementStart('body'); $this->element('p', array('id' => 'command_result'), + // TRANS: Confirmation text after sending a direct message. + // TRANS: %s is the direct message recipient. sprintf(_('Direct message to %s sent.'), $this->other->nickname)); $this->elementEnd('body'); @@ -210,6 +223,7 @@ class NewmessageAction extends Action { $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); + // TRANS: Page title after an AJAX error occurred on the "send direct message" page. $this->element('title', null, _('Ajax Error')); $this->elementEnd('head'); $this->elementStart('body'); @@ -231,6 +245,7 @@ class NewmessageAction extends Action $this->xw->startDocument('1.0', 'UTF-8'); $this->elementStart('html'); $this->elementStart('head'); + // TRANS: Page title on page for sending a direct message. $this->element('title', null, _('New message')); $this->elementEnd('head'); $this->elementStart('body'); diff --git a/actions/newnotice.php b/actions/newnotice.php index bc7ab28950..c145712f51 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -66,6 +66,7 @@ class NewnoticeAction extends Action function title() { + // TRANS: Page title for sending a new notice. return _('New notice'); } @@ -85,6 +86,7 @@ class NewnoticeAction extends Action function handle($args) { if (!common_logged_in()) { + // TRANS: Client error displayed trying to send a notice while not logged in. $this->clientError(_('Not logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { // check for this before token since all POST and FILES data @@ -137,6 +139,7 @@ class NewnoticeAction extends Action Event::handle('StartSaveNewNoticeWeb', array($this, $user, &$content, &$options)); if (!$content) { + // TRANS: Client error displayed trying to send a notice without content. $this->clientError(_('No content!')); return; } @@ -227,6 +230,7 @@ class NewnoticeAction extends Action $this->xw->startDocument('1.0', 'UTF-8'); $this->elementStart('html'); $this->elementStart('head'); + // TRANS: Page title after sending a notice. $this->element('title', null, _('Notice posted')); $this->elementEnd('head'); $this->elementStart('body'); @@ -261,6 +265,7 @@ class NewnoticeAction extends Action { $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); + // TRANS: Page title after an AJAX error occurs on the send notice page. $this->element('title', null, _('Ajax Error')); $this->elementEnd('head'); $this->elementStart('body'); diff --git a/actions/nudge.php b/actions/nudge.php index 219a8c9aba..61874c7505 100644 --- a/actions/nudge.php +++ b/actions/nudge.php @@ -60,6 +60,7 @@ class NudgeAction extends Action parent::handle($args); if (!common_logged_in()) { + // TRANS: Client error displayed trying to nudge a user without being logged in. $this->clientError(_('Not logged in.')); return; } @@ -82,6 +83,7 @@ class NudgeAction extends Action } if (!$other->email || !$other->emailnotifynudge) { + // TRANS: Client error displayed trying to nudge a user that cannot be nudged. $this->clientError(_('This user doesn\'t allow nudges or hasn\'t confirmed or set their email address yet.')); return; } @@ -91,9 +93,11 @@ class NudgeAction extends Action if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); + // TRANS: Page title after sending a nudge. $this->element('title', null, _('Nudge sent')); $this->elementEnd('head'); $this->elementStart('body'); + // TRANS: Confirmation text after sending a nudge. $this->element('p', array('id' => 'nudge_response'), _('Nudge sent!')); $this->elementEnd('body'); $this->elementEnd('html'); @@ -129,4 +133,3 @@ class NudgeAction extends Action return true; } } - diff --git a/actions/oembed.php b/actions/oembed.php index 0d8be55656..e293e4d27d 100644 --- a/actions/oembed.php +++ b/actions/oembed.php @@ -61,6 +61,8 @@ class OembedAction extends Action $proxy_args = $r->map($path); if (!$proxy_args) { + // TRANS: Server error displayed in oEmbed action when path not found. + // TRANS: %s is a path. $this->serverError(sprintf(_('"%s" not found.'),$path), 404); } $oembed=array(); @@ -73,13 +75,17 @@ class OembedAction extends Action $id = $proxy_args['notice']; $notice = Notice::staticGet($id); if(empty($notice)){ + // TRANS: Server error displayed in oEmbed action when notice not found. + // TRANS: %s is a notice. $this->serverError(sprintf(_("Notice %s not found."),$id), 404); } $profile = $notice->getProfile(); if (empty($profile)) { + // TRANS: Server error displayed in oEmbed action when notice has not profile. $this->serverError(_('Notice has no profile.'), 500); } $authorname = $profile->getFancyName(); + // TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date. $oembed['title'] = sprintf(_('%1$s\'s status on %2$s'), $authorname, common_exact_date($notice->created)); @@ -92,6 +98,8 @@ class OembedAction extends Action $id = $proxy_args['attachment']; $attachment = File::staticGet($id); if(empty($attachment)){ + // TRANS: Server error displayed in oEmbed action when attachment not found. + // TRANS: %d is an attachment ID. $this->serverError(sprintf(_('Attachment %s not found.'),$id), 404); } if(empty($attachment->filename) && $file_oembed = File_oembed::staticGet('file_id', $attachment->id)){ @@ -133,6 +141,8 @@ class OembedAction extends Action if($attachment->title) $oembed['title']=$attachment->title; break; default: + // TRANS: Server error displayed in oEmbed request when a path is not supported. + // TRANS: %s is a path. $this->serverError(sprintf(_('"%s" not supported for oembed requests.'),$path), 501); } switch($args['format']){ @@ -190,6 +200,7 @@ class OembedAction extends Action } break; default: + // TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format. $this->serverError(_('Not a supported data format.'), 501); break; } @@ -209,6 +220,7 @@ class OembedAction extends Action } break; default: + // TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format. $this->serverError(_('Not a supported data format.'), 501); break; } diff --git a/actions/opensearch.php b/actions/opensearch.php index 7bf32277bb..b1529860a8 100644 --- a/actions/opensearch.php +++ b/actions/opensearch.php @@ -63,8 +63,8 @@ class OpensearchAction extends Action // TRANS: ShortName in the OpenSearch interface when trying to find users. $short_name = _('People Search'); } else { - // TRANS: ShortName in the OpenSearch interface when trying to find notices. $type = 'noticesearch'; + // TRANS: ShortName in the OpenSearch interface when trying to find notices. $short_name = _('Notice Search'); } header('Content-Type: application/opensearchdescription+xml');