git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 06ca06fb authored by Siebrand Mazeland's avatar Siebrand Mazeland

* L10/i18n review.

* Translator hints added
* whitespace updates
parent 54c88cba
......@@ -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;
......
......@@ -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();
......
<?php
/**
* Anonymous disfavor action
*
......@@ -58,6 +57,7 @@ class AnonDisfavorAction extends RedirectingAction
if (empty($profile) || $_SERVER['REQUEST_METHOD'] != 'POST') {
$this->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
}
}
}
......@@ -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');
}
}
<?php
/**
* Anonyous favor action
*
......@@ -57,8 +56,8 @@ class AnonFavorAction extends RedirectingAction
$profile = AnonymousFavePlugin::getAnonProfile();
if (empty($profile) || $_SERVER['REQUEST_METHOD'] != 'POST') {
$this->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');
......
......@@ -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');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment