From a4e334a0ba25ed3809ba4ce5adff04b986e3eb3b Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 18 Mar 2011 18:03:41 +0100 Subject: [PATCH] Translator documentation added/updated. i18n updates. Superfluous whitespace removed. --- lib/topposterssection.php | 2 +- lib/unsandboxform.php | 8 +++----- lib/unsilenceform.php | 6 ++---- lib/unsubscribeform.php | 13 +++++-------- lib/util.php | 13 +++++++------ 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/lib/topposterssection.php b/lib/topposterssection.php index cbb6a98ebd..c621504215 100644 --- a/lib/topposterssection.php +++ b/lib/topposterssection.php @@ -43,7 +43,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class TopPostersSection extends ProfileSection { function getProfiles() @@ -71,6 +70,7 @@ class TopPostersSection extends ProfileSection function title() { + // TRANS: Title for top posters section. return _('Top posters'); } diff --git a/lib/unsandboxform.php b/lib/unsandboxform.php index a77634244a..9cb39aeb02 100644 --- a/lib/unsandboxform.php +++ b/lib/unsandboxform.php @@ -44,7 +44,6 @@ if (!defined('STATUSNET')) { * * @see UnSandboxForm */ - class UnsandboxForm extends ProfileActionForm { /** @@ -52,7 +51,6 @@ class UnsandboxForm extends ProfileActionForm * * @return string Name of the action, lowercased. */ - function target() { return 'unsandbox'; @@ -63,10 +61,10 @@ class UnsandboxForm extends ProfileActionForm * * @return string Title of the form, internationalized */ - function title() { - return _('Unsandbox'); + // TRANS: Title for unsandbox form. + return _m('TITLE','Unsandbox'); } /** @@ -74,9 +72,9 @@ class UnsandboxForm extends ProfileActionForm * * @return string description of the form, internationalized */ - function description() { + // TRANS: Description for unsandbox form. return _('Unsandbox this user'); } } diff --git a/lib/unsilenceform.php b/lib/unsilenceform.php index ac02b8b6c6..520efda4e7 100644 --- a/lib/unsilenceform.php +++ b/lib/unsilenceform.php @@ -42,7 +42,6 @@ if (!defined('STATUSNET')) { * * @see SilenceForm */ - class UnSilenceForm extends ProfileActionForm { /** @@ -50,7 +49,6 @@ class UnSilenceForm extends ProfileActionForm * * @return string Name of the action, lowercased. */ - function target() { return 'unsilence'; @@ -61,9 +59,9 @@ class UnSilenceForm extends ProfileActionForm * * @return string Title of the form, internationalized */ - function title() { + // TRANS: Title for unsilence form. return _('Unsilence'); } @@ -72,9 +70,9 @@ class UnSilenceForm extends ProfileActionForm * * @return string description of the form, internationalized */ - function description() { + // TRANS: Form description for unsilence form. return _('Unsilence this user'); } } diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php index a8e6915d6c..0332bd8ca6 100644 --- a/lib/unsubscribeform.php +++ b/lib/unsubscribeform.php @@ -46,7 +46,6 @@ require_once INSTALLDIR.'/lib/form.php'; * * @see SubscribeForm */ - class UnsubscribeForm extends Form { /** @@ -61,7 +60,6 @@ class UnsubscribeForm extends Form * @param HTMLOutputter $out output channel * @param Profile $profile profile of user to unsub from */ - function __construct($out=null, $profile=null) { parent::__construct($out); @@ -74,7 +72,6 @@ class UnsubscribeForm extends Form * * @return int ID of the form */ - function id() { return 'unsubscribe-' . $this->profile->id; @@ -86,7 +83,6 @@ class UnsubscribeForm extends Form * * @return string of the form class */ - function formClass() { return 'form_user_unsubscribe ajax'; @@ -97,7 +93,6 @@ class UnsubscribeForm extends Form * * @return string URL of the action */ - function action() { return common_local_url('unsubscribe'); @@ -110,6 +105,7 @@ class UnsubscribeForm extends Form */ function formLegend() { + // TRANS: Form legend on unsubscribe form. $this->out->element('legend', null, _('Unsubscribe from this user')); } @@ -118,7 +114,6 @@ class UnsubscribeForm extends Form * * @return void */ - function formData() { $this->out->hidden('unsubscribeto-' . $this->profile->id, @@ -131,9 +126,11 @@ class UnsubscribeForm extends Form * * @return void */ - function formActions() { - $this->out->submit('submit', _('Unsubscribe'), 'submit', null, _('Unsubscribe from this user')); + // TRANS: Button text on unsubscribe form. + $this->out->submit('submit', _m('BUTTON','Unsubscribe'), 'submit', null, + // TRANS: Button title on unsubscribe form. + _('Unsubscribe from this user')); } } diff --git a/lib/util.php b/lib/util.php index 536fff4dec..511dcdfb86 100644 --- a/lib/util.php +++ b/lib/util.php @@ -318,6 +318,7 @@ function common_set_user($user) if (Event::handle('StartSetUser', array(&$user))) { if (!empty($user)) { if (!$user->hasRight(Right::WEBLOGIN)) { + // TRANS: Authorisation exception thrown when a user a not allowed to login. throw new AuthorizationException(_('Not allowed to log in.')); } common_ensure_session(); @@ -867,7 +868,7 @@ function common_replace_urls_callback($text, $callback, $arg = null) { * @param callable $callback * @param mixed $arg optional argument to pass on as second param to callback * @return string - * + * * @access private */ function callback_helper($matches, $callback, $arg=null) { @@ -1335,28 +1336,28 @@ function common_date_string($dt) } else if ($diff < 3300) { $minutes = round($diff/60); // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf( ngettext('about one minute ago', 'about %d minutes ago', $minutes), $minutes); + return sprintf( _m('about one minute ago', 'about %d minutes ago', $minutes), $minutes); } else if ($diff < 5400) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about an hour ago'); } else if ($diff < 22 * 3600) { $hours = round($diff/3600); // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf( ngettext('about one hour ago', 'about %d hours ago', $hours), $hours); + return sprintf( _m('about one hour ago', 'about %d hours ago', $hours), $hours); } else if ($diff < 37 * 3600) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about a day ago'); } else if ($diff < 24 * 24 * 3600) { $days = round($diff/(24*3600)); // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf( ngettext('about one day ago', 'about %d days ago', $days), $days); + return sprintf( _m('about one day ago', 'about %d days ago', $days), $days); } else if ($diff < 46 * 24 * 3600) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about a month ago'); } else if ($diff < 330 * 24 * 3600) { $months = round($diff/(30*24*3600)); // TRANS: Used in notices to indicate when the notice was made compared to now. - return sprintf( ngettext('about one month ago', 'about %d months ago',$months), $months); + return sprintf( _m('about one month ago', 'about %d months ago',$months), $months); } else if ($diff < 480 * 24 * 3600) { // TRANS: Used in notices to indicate when the notice was made compared to now. return _('about a year ago'); @@ -2075,7 +2076,7 @@ function common_shorten_url($long_url, User $user=null, $force = false) $shortenerName = User_urlshortener_prefs::urlShorteningService($user); - if (Event::handle('StartShortenUrl', + if (Event::handle('StartShortenUrl', array($long_url, $shortenerName, &$shortenedUrl))) { if ($shortenerName == 'internal') { $f = File::processNew($long_url);