From 06ca06fbd16f11e3c37d22f1f9c4b64c0089193c Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 1 Oct 2010 21:45:19 +0200 Subject: [PATCH] * L10/i18n review. * Translator hints added * whitespace updates --- plugins/AnonymousFave/AnonymousFavePlugin.php | 7 ++++++- plugins/AnonymousFave/Fave_tally.php | 16 ++++++---------- plugins/AnonymousFave/anondisfavor.php | 7 +++++-- plugins/AnonymousFave/anondisfavorform.php | 5 ----- plugins/AnonymousFave/anonfavor.php | 9 ++++++--- plugins/AnonymousFave/anonfavorform.php | 3 --- 6 files changed, 23 insertions(+), 24 deletions(-) diff --git a/plugins/AnonymousFave/AnonymousFavePlugin.php b/plugins/AnonymousFave/AnonymousFavePlugin.php index 72093e7f7e..6561114bab 100644 --- a/plugins/AnonymousFave/AnonymousFavePlugin.php +++ b/plugins/AnonymousFave/AnonymousFavePlugin.php @@ -188,7 +188,9 @@ class AnonymousFavePlugin extends Plugin { 'class' => 'notice-tally' ) ); - $out->raw(sprintf(_m("favored %d times"), $tally->count)); + // TRANS: Tally for number of times a notice was favored. + // TRANS: %d is the number of times a notice was favored. + $out->raw(sprintf(_m("favored once", "favored %d times", $tally->count), $tally->count)); $out->elementEnd('div'); } } @@ -216,6 +218,7 @@ class AnonymousFavePlugin extends Plugin { $id = $profile->insert(); if (!$id) { + // TRANS: Server exception. throw new ServerException(_m("Couldn't create anonymous user session.")); } @@ -226,6 +229,7 @@ class AnonymousFavePlugin extends Plugin { $result = $profile->update($orig); if (!$result) { + // TRANS: Server exception. throw new ServerException(_m("Couldn't create anonymous user session.")); } @@ -279,6 +283,7 @@ class AnonymousFavePlugin extends Plugin { 'author' => 'Zach Copley', 'homepage' => $url, 'rawdescription' => + // TRANS: Plugin description. _m('Allow anonymous users to favorite notices.')); return true; diff --git a/plugins/AnonymousFave/Fave_tally.php b/plugins/AnonymousFave/Fave_tally.php index b350d5a0a5..f48a1e82b3 100644 --- a/plugins/AnonymousFave/Fave_tally.php +++ b/plugins/AnonymousFave/Fave_tally.php @@ -44,7 +44,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ - class Fave_tally extends Memcached_DataObject { ###START_AUTOCODE @@ -85,7 +84,6 @@ class Fave_tally extends Memcached_DataObject * * @return array list of key field names */ - function keys() { return array_keys($this->keyTypes()); @@ -103,7 +101,6 @@ class Fave_tally extends Memcached_DataObject * 'K' for primary key: for compound keys, add an entry for each component; * 'U' for unique keys: compound keys are not well supported here. */ - function keyTypes() { return array('notice_id' => 'K'); @@ -119,8 +116,6 @@ class Fave_tally extends Memcached_DataObject * * @return array magic three-false array that stops auto-incrementing. */ - - function sequenceKey() { return array(false, false, false); @@ -133,7 +128,6 @@ class Fave_tally extends Memcached_DataObject * * @return User_flag_profile found object or null */ - function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Fave_tally', $kv); @@ -146,7 +140,6 @@ class Fave_tally extends Memcached_DataObject * * @return Fave_tally $tally the tally data object */ - static function increment($noticeID) { $tally = Fave_tally::ensureTally($noticeID); @@ -157,6 +150,8 @@ class Fave_tally extends Memcached_DataObject if (!$result) { $msg = sprintf( + // TRANS: Server exception. + // TRANS: %d is the notice ID (number). _m("Couldn't update favorite tally for notice ID %d."), $noticeID ); @@ -173,7 +168,6 @@ class Fave_tally extends Memcached_DataObject * * @return Fave_tally $tally the tally data object */ - static function decrement($noticeID) { $tally = Fave_tally::ensureTally($noticeID); @@ -185,6 +179,8 @@ class Fave_tally extends Memcached_DataObject if (!$result) { $msg = sprintf( + // TRANS: Server exception. + // TRANS: %d is the notice ID (number). _m("Couldn't update favorite tally for notice ID %d."), $noticeID ); @@ -203,7 +199,6 @@ class Fave_tally extends Memcached_DataObject * * @return Fave_tally the tally data object */ - static function ensureTally($noticeID) { $tally = Fave_tally::staticGet('notice_id', $noticeID); @@ -215,6 +210,8 @@ class Fave_tally extends Memcached_DataObject $result = $tally->insert(); if (!$result) { $msg = sprintf( + // TRANS: Server exception. + // TRANS: %d is the notice ID (number). _m("Couldn't create favorite tally for notice ID %d."), $noticeID ); @@ -233,7 +230,6 @@ class Fave_tally extends Memcached_DataObject * * @return integer $total total number of time the notice has been favored */ - static function countExistingFaves($noticeID) { $fave = new Fave(); diff --git a/plugins/AnonymousFave/anondisfavor.php b/plugins/AnonymousFave/anondisfavor.php index f39d5a7780..859e4bd427 100644 --- a/plugins/AnonymousFave/anondisfavor.php +++ b/plugins/AnonymousFave/anondisfavor.php @@ -1,5 +1,4 @@ clientError( + // TRANS: Client error. _m('Could not disfavor notice! Please make sure your browser has cookies enabled.') ); return; @@ -68,6 +68,7 @@ class AnonDisfavorAction extends RedirectingAction $token = $this->trimmed('token-' . $notice->id); if (!$token || $token != common_session_token()) { + // TRANS: Client error. $this->clientError(_m('There was a problem with your session token. Try again, please.')); return; } @@ -77,6 +78,7 @@ class AnonDisfavorAction extends RedirectingAction $fave->notice_id = $notice->id; if (!$fave->find(true)) { + // TRANS: Client error. $this->clientError(_m('This notice is not a favorite!')); return; } @@ -85,6 +87,7 @@ class AnonDisfavorAction extends RedirectingAction if (!$result) { common_log_db_error($fave, 'DELETE', __FILE__); + // TRANS: Server error. $this->serverError(_m('Could not delete favorite.')); return; } @@ -94,6 +97,7 @@ class AnonDisfavorAction extends RedirectingAction if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); + // TRANS: Title. $this->element('title', null, _m('Add to favorites')); $this->elementEnd('head'); $this->elementStart('body'); @@ -121,4 +125,3 @@ class AnonDisfavorAction extends RedirectingAction } } } - diff --git a/plugins/AnonymousFave/anondisfavorform.php b/plugins/AnonymousFave/anondisfavorform.php index c347ed7b43..38e2903db1 100644 --- a/plugins/AnonymousFave/anondisfavorform.php +++ b/plugins/AnonymousFave/anondisfavorform.php @@ -44,17 +44,14 @@ require_once INSTALLDIR.'/lib/form.php'; * * @see DisFavorForm */ - class AnonDisfavorForm extends DisFavorForm { - /** * Constructor * * @param HTMLOutputter $out output channel * @param Notice $notice notice to disfavor */ - function __construct($out=null, $notice=null) { parent::__construct($out, $notice); @@ -65,10 +62,8 @@ class AnonDisfavorForm extends DisFavorForm * * @return string URL of the action */ - function action() { return common_local_url('AnonDisFavor'); } - } diff --git a/plugins/AnonymousFave/anonfavor.php b/plugins/AnonymousFave/anonfavor.php index 58570ced9a..ad13525a07 100644 --- a/plugins/AnonymousFave/anonfavor.php +++ b/plugins/AnonymousFave/anonfavor.php @@ -1,5 +1,4 @@ clientError( - _m('Could not favor notice! Please make sure your browser has cookies enabled.') + // TRANS: Client error. + $this->clientError( _m('Could not favor notice! Please make sure your browser has cookies enabled.') ); return; } @@ -68,18 +67,21 @@ class AnonFavorAction extends RedirectingAction $token = $this->trimmed('token-' . $notice->id); if (empty($token) || $token != common_session_token()) { + // TRANS: Client error. $this->clientError(_m('There was a problem with your session token. Try again, please.')); return; } if ($profile->hasFave($notice)) { + // TRANS: Client error. $this->clientError(_m('This notice is already a favorite!')); return; } $fave = Fave::addNew($profile, $notice); if (!$fave) { + // TRANS: Server error. $this->serverError(_m('Could not create favorite.')); return; } @@ -89,6 +91,7 @@ class AnonFavorAction extends RedirectingAction if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); + // TRANS: Title. $this->element('title', null, _m('Disfavor favorite')); $this->elementEnd('head'); $this->elementStart('body'); diff --git a/plugins/AnonymousFave/anonfavorform.php b/plugins/AnonymousFave/anonfavorform.php index d73c2831d0..2fbd015e36 100644 --- a/plugins/AnonymousFave/anonfavorform.php +++ b/plugins/AnonymousFave/anonfavorform.php @@ -44,7 +44,6 @@ require_once INSTALLDIR.'/lib/form.php'; * * @see AnonDisfavorForm */ - class AnonFavorForm extends FavorForm { @@ -54,7 +53,6 @@ class AnonFavorForm extends FavorForm * @param HTMLOutputter $out output channel * @param Notice $notice notice to favor */ - function __construct($out=null, $notice=null) { parent::__construct($out, $notice); @@ -65,7 +63,6 @@ class AnonFavorForm extends FavorForm * * @return string URL of the action */ - function action() { return common_local_url('AnonFavor');