From e48c26e15695de321ce3de426b0e736d494bcbc6 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 20 May 2011 16:57:05 +0200 Subject: [PATCH] Update translator documentation, i18n and L10n. --- lib/inviteform.php | 15 +++++------ .../DomainWhitelist/DomainWhitelistPlugin.php | 4 +-- .../lib/whitelistinviteform.php | 27 ++++++++++--------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/inviteform.php b/lib/inviteform.php index da23d31264..364ca75b9b 100644 --- a/lib/inviteform.php +++ b/lib/inviteform.php @@ -41,7 +41,6 @@ require_once INSTALLDIR . '/lib/form.php'; * @author Zach Copley * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ - * */ class InviteForm extends Form { @@ -95,21 +94,21 @@ class InviteForm extends Form { $this->out->elementStart('ul', 'form_data'); $this->out->elementStart('li'); - // TRANS: Field label for a list of e-mail addresses. $this->out->textarea( 'addresses', + // TRANS: Field label for a list of e-mail addresses. _('Email addresses'), $this->out->trimmed('addresses'), - // TRANS: Tooltip for field label for a list of e-mail addresses. + // TRANS: Field title for a list of e-mail addresses. _('Addresses of friends to invite (one per line).') ); $this->out->elementEnd('li'); $this->out->elementStart('li'); - // TRANS: Field label for a personal message to send to invitees. $this->out->textarea( + // TRANS: Field label for a personal message to send to invitees. 'personal', _('Personal message'), $this->out->trimmed('personal'), - // TRANS: Tooltip for field label for a personal message to send to invitees. + // TRANS: Field title for a personal message to send to invitees. _('Optionally add a personal message to the invitation.') ); $this->out->elementEnd('li'); @@ -123,13 +122,13 @@ class InviteForm extends Form */ function formActions() { - // TRANS: Send button for inviting friends $this->out->submit( 'send', + // TRANS: Send button for inviting friends _m('BUTTON','Send'), 'submit form_action-primary', - // TRANS: Submit button title. 'send', - _('Send') + // TRANS: Submit button title. + _('Send invitations.') ); } } diff --git a/plugins/DomainWhitelist/DomainWhitelistPlugin.php b/plugins/DomainWhitelist/DomainWhitelistPlugin.php index cf0d94884d..da49338fe7 100644 --- a/plugins/DomainWhitelist/DomainWhitelistPlugin.php +++ b/plugins/DomainWhitelist/DomainWhitelistPlugin.php @@ -118,7 +118,7 @@ class DomainWhitelistPlugin extends Plugin } else { // TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist. // TRANS: %s are whitelisted e-mail domains separated by comma's (localisable). - $message = sprintf(_('Email address must be in one of these domains: %s.'), + $message = sprintf(_m('Email address must be in one of these domains: %s.'), // TRANS: Separator for whitelisted domains. implode(_m('SEPARATOR',', '), $whitelist)); } @@ -132,7 +132,7 @@ class DomainWhitelistPlugin extends Plugin { if (!$this->matchesWhitelist($email)) { // TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist. - throw new Exception(_('That email address is not allowed on this site.')); + throw new Exception(_m('That email address is not allowed on this site.')); } return true; diff --git a/plugins/DomainWhitelist/lib/whitelistinviteform.php b/plugins/DomainWhitelist/lib/whitelistinviteform.php index 7ff730e6a8..77a48f92fa 100644 --- a/plugins/DomainWhitelist/lib/whitelistinviteform.php +++ b/plugins/DomainWhitelist/lib/whitelistinviteform.php @@ -46,7 +46,7 @@ require_once INSTALLDIR . '/lib/form.php'; class WhitelistInviteForm extends Form { private $whitelist = null; - + /** * Constructor * @@ -86,7 +86,7 @@ class WhitelistInviteForm extends Form function formLegend() { // TRANS: Form legend. - $this->out->element('legend', null, _('Invite collegues')); + $this->out->element('legend', null, _m('Invite collegues')); } /** @@ -101,17 +101,17 @@ class WhitelistInviteForm extends Form $this->showEmailLI(); } $this->out->elementStart('li'); - // TRANS: Field label for a personal message to send to invitees. $this->out->textarea( - 'personal', _('Personal message'), + // TRANS: Field label for a personal message to send to invitees. + 'personal', _m('Personal message'), $this->out->trimmed('personal'), - // TRANS: Tooltip for field label for a personal message to send to invitees. - _('Optionally add a personal message to the invitation.') + // TRANS: Field title for a personal message to send to invitees. + _m('Optionally add a personal message to the invitation.') ); $this->out->elementEnd('li'); $this->out->elementEnd('ul'); } - + function showEmailLI() { $this->out->elementStart('li'); @@ -119,8 +119,8 @@ class WhitelistInviteForm extends Form $this->out->text('@'); if (count($this->whitelist) == 1) { $this->out->element( - 'span', - array('class' => 'email_invite'), + 'span', + array('class' => 'email_invite'), $this->whitelist[0] ); $this->out->hidden('domain[]', $this->whitelist[0]); @@ -154,10 +154,11 @@ class WhitelistInviteForm extends Form 'href' => 'javascript://', 'style' => 'display: none;' ), + // TRANS: Link description to action to add another item to a list. _m('Add another item') ); } - + /** * Action elements * @@ -165,13 +166,13 @@ class WhitelistInviteForm extends Form */ function formActions() { - // TRANS: Send button for inviting friends $this->out->submit( 'send', + // TRANS: Send button for inviting friends. _m('BUTTON','Send'), 'submit form_action-primary', - // TRANS: Submit button title. 'send', - _('Send') + // TRANS: Submit button title. + _m('Send invitations.') ); } }