From 2640232c68223f98f08ad7c5fc06ec4b8e99f5e5 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 7 Apr 2011 14:01:40 +0200 Subject: [PATCH] Update translator documentation. L10n and i18n updates. Break long lines in README before or at 80 characters. Superfluous whitespace removed. --- plugins/Echo/EchoPlugin.php | 1 + .../EmailAuthenticationPlugin.php | 1 + plugins/EmailAuthentication/README | 5 +- plugins/EmailSummary/EmailSummaryPlugin.php | 54 ++++++++----------- plugins/EmailSummary/Email_summary_status.php | 10 +--- .../EmailSummary/siteemailsummaryhandler.php | 16 +++--- .../EmailSummary/useremailsummaryhandler.php | 54 +++++++++---------- plugins/Enjit/enjitqueuehandler.php | 2 +- plugins/Event/EventPlugin.php | 27 ++++++---- plugins/Event/Happening.php | 5 +- plugins/Event/RSVP.php | 40 ++++++++++++-- plugins/Event/cancelrsvp.php | 17 +++--- plugins/Event/cancelrsvpform.php | 12 ++--- plugins/Event/event.css | 1 - plugins/Event/eventform.php | 27 +++++++--- plugins/Event/newevent.php | 26 +++++---- plugins/Event/newrsvp.php | 21 ++++---- plugins/Event/rsvpform.php | 14 +++-- plugins/Event/showevent.php | 2 +- plugins/Event/showrsvp.php | 2 +- 20 files changed, 182 insertions(+), 155 deletions(-) diff --git a/plugins/Echo/EchoPlugin.php b/plugins/Echo/EchoPlugin.php index cd8d8c0e73..a6f87bc38d 100644 --- a/plugins/Echo/EchoPlugin.php +++ b/plugins/Echo/EchoPlugin.php @@ -108,6 +108,7 @@ class EchoPlugin extends Plugin 'author' => 'Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:Echo', 'rawdescription' => + // TRANS: Plugin description. _m('Use Echo'. ' to add commenting to notice pages.')); return true; diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php index 689d6231d1..e55614ea43 100644 --- a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php +++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php @@ -57,6 +57,7 @@ class EmailAuthenticationPlugin extends Plugin 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:EmailAuthentication', 'rawdescription' => + // TRANS: Plugin description. _m('The Email Authentication plugin allows users to login using their email address.')); return true; } diff --git a/plugins/EmailAuthentication/README b/plugins/EmailAuthentication/README index 3208156896..3fc40794be 100644 --- a/plugins/EmailAuthentication/README +++ b/plugins/EmailAuthentication/README @@ -1,7 +1,8 @@ The Email Authentication plugin allows users to login using their email address. -The provided email address is used to lookup the user's nickname, then that nickname and the provided password is checked. +The provided email address is used to lookup the user's nickname, then that +nickname and the provided password is checked. Installation ============ -add "addPlugin('emailAuthentication');" to the bottom of your config.php +add "addPlugin('emailAuthentication');" to the bottom of your config.php. diff --git a/plugins/EmailSummary/EmailSummaryPlugin.php b/plugins/EmailSummary/EmailSummaryPlugin.php index 66c1214106..36aec6c96c 100644 --- a/plugins/EmailSummary/EmailSummaryPlugin.php +++ b/plugins/EmailSummary/EmailSummaryPlugin.php @@ -43,7 +43,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class EmailSummaryPlugin extends Plugin { /** @@ -51,13 +50,11 @@ class EmailSummaryPlugin extends Plugin * * @return boolean hook value */ - function onCheckSchema() { $schema = Schema::get(); // For storing user-submitted flags on profiles - $schema->ensureTable('email_summary_status', array(new ColumnDef('user_id', 'integer', null, false, 'PRI'), @@ -80,9 +77,8 @@ class EmailSummaryPlugin extends Plugin * @param string $cls Name of the class to be loaded * * @return boolean hook value; true means continue processing, false means stop. - * + * */ - function onAutoload($cls) { $dir = dirname(__FILE__); @@ -107,9 +103,7 @@ class EmailSummaryPlugin extends Plugin * @param array &$versions array of version data * * @return boolean hook value; true means continue processing, false means stop. - * */ - function onPluginVersion(&$versions) { $versions[] = array('name' => 'EmailSummary', @@ -117,86 +111,84 @@ class EmailSummaryPlugin extends Plugin 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:EmailSummary', 'rawdescription' => + // TRANS: Plugin description. _m('Send an email summary of the inbox to users.')); return true; } /** * Register our queue handlers - * + * * @param QueueManager $qm Current queue manager - * + * * @return boolean hook value */ - function onEndInitializeQueueManager($qm) { $qm->connect('sitesum', 'SiteEmailSummaryHandler'); $qm->connect('usersum', 'UserEmailSummaryHandler'); return true; } - + /** * Add a checkbox to turn off email summaries - * + * * @param Action $action Action being executed (emailsettings) - * + * * @return boolean hook value */ - function onEndEmailFormData($action) { $user = common_current_user(); - + $action->elementStart('li'); $action->checkbox('emailsummary', // TRANS: Checkbox label in e-mail preferences form. - _m('Send me a periodic summary of updates from my network.'), + _m('Send me a periodic summary of updates from my network'), Email_summary_status::getSendSummary($user->id)); $action->elementEnd('li'); return true; } - + /** * Add a checkbox to turn off email summaries - * + * * @param Action $action Action being executed (emailsettings) - * + * * @return boolean hook value */ - function onEndEmailSaveForm($action) { $sendSummary = $action->boolean('emailsummary'); - + $user = common_current_user(); - + if (!empty($user)) { - + $ess = Email_summary_status::staticGet('user_id', $user->id); - + if (empty($ess)) { - + $ess = new Email_summary_status(); $ess->user_id = $user->id; $ess->send_summary = $sendSummary; $ess->created = common_sql_now(); $ess->modified = common_sql_now(); - + $ess->insert(); - + } else { - + $orig = clone($ess); - + $ess->send_summary = $sendSummary; $ess->modified = common_sql_now(); - + $ess->update($orig); } } - + return true; } } diff --git a/plugins/EmailSummary/Email_summary_status.php b/plugins/EmailSummary/Email_summary_status.php index 7072370faf..0c9e880f18 100644 --- a/plugins/EmailSummary/Email_summary_status.php +++ b/plugins/EmailSummary/Email_summary_status.php @@ -35,7 +35,7 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; /** * Data class for email summaries - * + * * Email summary information for users * * @category Action @@ -46,7 +46,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; * * @see DB_DataObject */ - class Email_summary_status extends Memcached_DataObject { public $__table = 'email_summary_status'; // table name @@ -78,7 +77,6 @@ class Email_summary_status extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, @@ -93,7 +91,6 @@ class Email_summary_status extends Memcached_DataObject * * @return array list of key field names */ - function keys() { return array_keys($this->keyTypes()); @@ -121,7 +118,6 @@ class Email_summary_status extends Memcached_DataObject * * @return array magic three-false array that stops auto-incrementing. */ - function sequenceKey() { return array(false, false, false); @@ -134,7 +130,6 @@ class Email_summary_status extends Memcached_DataObject * * @return int flag for whether to send this user a summary email */ - static function getSendSummary($user_id) { $ess = Email_summary_status::staticGet('user_id', $user_id); @@ -153,11 +148,10 @@ class Email_summary_status extends Memcached_DataObject * * @return Email_summary_status instance for this user, with count already incremented. */ - static function getLastSummaryID($user_id) { $ess = Email_summary_status::staticGet('user_id', $user_id); - + if (!empty($ess)) { return $ess->last_summary_id; } else { diff --git a/plugins/EmailSummary/siteemailsummaryhandler.php b/plugins/EmailSummary/siteemailsummaryhandler.php index 1c0d4997de..3369a5a703 100644 --- a/plugins/EmailSummary/siteemailsummaryhandler.php +++ b/plugins/EmailSummary/siteemailsummaryhandler.php @@ -1,7 +1,7 @@ find(); - + while ($user->fetch()) { try { $qm->enqueue($user->id, 'usersum'); @@ -89,8 +86,7 @@ class SiteEmailSummaryHandler extends QueueHandler } catch (Exception $e) { common_log(LOG_WARNING, $e->getMessage()); } - + return true; } } - diff --git a/plugins/EmailSummary/useremailsummaryhandler.php b/plugins/EmailSummary/useremailsummaryhandler.php index 5e10af40eb..2c8c0d9039 100644 --- a/plugins/EmailSummary/useremailsummaryhandler.php +++ b/plugins/EmailSummary/useremailsummaryhandler.php @@ -1,7 +1,7 @@ send_summary) { common_log(LOG_INFO, sprintf('Not sending email summary for user %s by request.', $user_id)); return true; } $since_id = null; - + if (!empty($ess)) { $since_id = $ess->last_summary_id; } - + $user = User::staticGet('id', $user_id); if (empty($user)) { common_log(LOG_INFO, sprintf('Not sending email summary for user %s; no such user.', $user_id)); return true; } - + if (empty($user->email)) { common_log(LOG_INFO, sprintf('Not sending email summary for user %s; no email address.', $user_id)); return true; } - + $profile = $user->getProfile(); - + if (empty($profile)) { common_log(LOG_WARNING, sprintf('Not sending email summary for user %s; no profile.', $user_id)); return true; } - + $notice = $user->ownFriendsTimeline(0, self::MAX_NOTICES, $since_id); if (empty($notice) || $notice->N == 0) { @@ -117,18 +113,20 @@ class UserEmailSummaryHandler extends QueueHandler // figuring out a better way. -ESP $new_top = null; - + if ($notice instanceof ArrayWrapper) { $new_top = $notice->_items[0]->id; } - + $out = new XMLStringer(); $out->elementStart('div', array('width' => '100%', 'style' => 'background-color: #ffffff; border: 4px solid #4c609a; padding: 10px;')); $out->elementStart('div', array('style' => 'color: #ffffff; background-color: #4c609a; font-weight: bold; margin-bottom: 10px; padding: 4px;')); - $out->raw(sprintf(_m('Recent updates from %1s for %2s:'), + // TRANS: Text in e-mail summary. + // TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name. + $out->raw(sprintf(_m('Recent updates from %1$s for %2s:'), common_config('site', 'name'), $profile->getBestName())); $out->elementEnd('div'); @@ -137,13 +135,12 @@ class UserEmailSummaryHandler extends QueueHandler 'style' => 'border: none; border-collapse: collapse;', 'cellpadding' => '6')); while ($notice->fetch()) { - $profile = Profile::staticGet('id', $notice->profile_id); - + if (empty($profile)) { continue; } - + $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); $out->elementStart('tr'); @@ -191,7 +188,7 @@ class UserEmailSummaryHandler extends QueueHandler $out->elementEnd('td'); $out->elementEnd('tr'); } - + $out->elementEnd('table'); $out->raw(sprintf(_m('

change your email settings for %2s

'), @@ -199,35 +196,32 @@ class UserEmailSummaryHandler extends QueueHandler common_config('site', 'name'))); $out->elementEnd('div'); - + $body = $out->getString(); - + // FIXME: do something for people who don't like HTML email - + mail_to_user($user, _m('Updates from your network'), $body, array('Content-Type' => 'text/html; charset=UTF-8')); if (empty($ess)) { - $ess = new Email_summary_status(); - + $ess->user_id = $user_id; $ess->created = common_sql_now(); $ess->last_summary_id = $new_top; $ess->modified = common_sql_now(); $ess->insert(); - } else { - $orig = clone($ess); - + $ess->last_summary_id = $new_top; $ess->modified = common_sql_now(); $ess->update($orig); } - + return true; } } diff --git a/plugins/Enjit/enjitqueuehandler.php b/plugins/Enjit/enjitqueuehandler.php index 4a68f4f6b6..284f29477c 100644 --- a/plugins/Enjit/enjitqueuehandler.php +++ b/plugins/Enjit/enjitqueuehandler.php @@ -23,7 +23,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { /** * Queue handler for watching new notices and posting to enjit. - * @fixme is this actually being used/functional atm? + * @todo FIXME: Is this actually being used/functional atm? */ class EnjitQueueHandler extends QueueHandler { diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php index 528c855bda..63d92e63c7 100644 --- a/plugins/Event/EventPlugin.php +++ b/plugins/Event/EventPlugin.php @@ -105,7 +105,6 @@ class EventPlugin extends MicroappPlugin * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) { $m->connect('main/event/new', @@ -130,12 +129,14 @@ class EventPlugin extends MicroappPlugin 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Event', 'description' => + // TRANS: Plugin description. _m('Event invitations and RSVPs.')); return true; } function appTitle() { - return _m('Event'); + // TRANS: Title for event application. + return _m('TITLE','Event'); } function tag() { @@ -162,12 +163,13 @@ class EventPlugin extends MicroappPlugin function saveNoticeFromActivity($activity, $actor, $options=array()) { if (count($activity->objects) != 1) { - throw new Exception('Too many activity objects.'); + throw new Exception(_('Too many activity objects.')); } $happeningObj = $activity->objects[0]; if ($happeningObj->type != Happening::OBJECT_TYPE) { + // TRANS: Exception thrown when event plugin comes across a non-event type object. throw new Exception(_m('Wrong type for object.')); } @@ -175,8 +177,8 @@ class EventPlugin extends MicroappPlugin switch ($activity->verb) { case ActivityVerb::POST: - $notice = Happening::saveNew($actor, - $start_time, + $notice = Happening::saveNew($actor, + $start_time, $end_time, $happeningObj->title, null, @@ -189,12 +191,14 @@ class EventPlugin extends MicroappPlugin $happening = Happening::staticGet('uri', $happeningObj->id); if (empty($happening)) { // FIXME: save the event + // TRANS: Exception thrown when trying to RSVP for an unknown event. throw new Exception(_m('RSVP for unknown event.')); } $notice = RSVP::saveNew($actor, $happening, $activity->verb, $options); break; default: - throw new Exception(_m('Unknown verb for events')); + // TRANS: Exception thrown when event plugin comes across a undefined verb. + throw new Exception(_m('Unknown verb for events.')); } return $notice; @@ -207,7 +211,6 @@ class EventPlugin extends MicroappPlugin * * @return ActivityObject */ - function activityObjectFromNotice($notice) { $happening = null; @@ -225,12 +228,14 @@ class EventPlugin extends MicroappPlugin } if (empty($happening)) { + // TRANS: Exception thrown when event plugin comes across a unknown object type. throw new Exception(_m('Unknown object type.')); } $notice = $happening->getNotice(); if (empty($notice)) { + // TRANS: Exception thrown when referring to a notice that is not an event an in event context. throw new Exception(_m('Unknown event notice.')); } @@ -264,7 +269,6 @@ class EventPlugin extends MicroappPlugin * * @return ActivityObject */ - function onEndNoticeAsActivity($notice, &$act) { switch ($notice->object_type) { case RSVP::POSITIVE: @@ -282,7 +286,6 @@ class EventPlugin extends MicroappPlugin * @param Notice $notice * @param HTMLOutputter $out */ - function showNotice($notice, $out) { switch ($notice->object_type) { @@ -365,6 +368,7 @@ class EventPlugin extends MicroappPlugin $out->elementStart('div', 'event-times'); // VEVENT/EVENT-TIMES IN + // TRANS: Field label for event description. $out->element('strong', null, _m('Time:')); $out->element('abbr', array('class' => 'dtstart', @@ -385,6 +389,7 @@ class EventPlugin extends MicroappPlugin if (!empty($event->location)) { $out->elementStart('div', 'event-location'); + // TRANS: Field label for event description. $out->element('strong', null, _m('Location:')); $out->element('span', 'location', $event->location); $out->elementEnd('div'); @@ -392,6 +397,7 @@ class EventPlugin extends MicroappPlugin if (!empty($event->description)) { $out->elementStart('div', 'event-description'); + // TRANS: Field label for event description. $out->element('strong', null, _m('Description:')); $out->element('span', 'description', $event->description); $out->elementEnd('div'); @@ -400,6 +406,7 @@ class EventPlugin extends MicroappPlugin $rsvps = $event->getRSVPs(); $out->elementStart('div', 'event-rsvps'); + // TRANS: Field label for event description. $out->element('strong', null, _m('Attending:')); $out->element('span', 'event-rsvps', // TRANS: RSVP counts. @@ -433,7 +440,6 @@ class EventPlugin extends MicroappPlugin * @param HTMLOutputter $out * @return Widget */ - function entryForm($out) { return new EventForm($out); @@ -444,7 +450,6 @@ class EventPlugin extends MicroappPlugin * * @param Notice $notice */ - function deleteRelated($notice) { switch ($notice->object_type) { diff --git a/plugins/Event/Happening.php b/plugins/Event/Happening.php index ec3e12595d..a2811252c0 100644 --- a/plugins/Event/Happening.php +++ b/plugins/Event/Happening.php @@ -47,7 +47,6 @@ if (!defined('STATUSNET')) { * * @see Managed_DataObject */ - class Happening extends Managed_DataObject { const OBJECT_TYPE = 'http://activitystrea.ms/schema/1.0/event'; @@ -122,6 +121,7 @@ class Happening extends Managed_DataObject if (array_key_exists('uri', $options)) { $other = Happening::staticGet('uri', $options['uri']); if (!empty($other)) { + // TRANS: Client exception thrown when trying to create an event that already exists. throw new ClientException(_m('Event already exists.')); } } @@ -163,6 +163,9 @@ class Happening extends Managed_DataObject $location, $description); + // TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time, + // TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description. + // TRANS: Class names should not be translated. $rendered = sprintf(_m(''. '%1$s '. '%3$s - '. diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php index 85862d375d..1f47958e9a 100644 --- a/plugins/Event/RSVP.php +++ b/plugins/Event/RSVP.php @@ -42,7 +42,6 @@ if (!defined('STATUSNET')) { * * @see Managed_DataObject */ - class RSVP extends Managed_DataObject { const POSITIVE = 'http://activitystrea.ms/schema/1.0/rsvp-yes'; @@ -64,7 +63,6 @@ class RSVP extends Managed_DataObject * @param mixed $v Value to lookup * * @return RSVP object found, or null for no hits - * */ function staticGet($k, $v=null) { @@ -77,7 +75,6 @@ class RSVP extends Managed_DataObject * @param array $kv array of key-value mappings * * @return Bookmark object found, or null for no hits - * */ function pkeyGet($kv) @@ -141,6 +138,7 @@ class RSVP extends Managed_DataObject if (array_key_exists('uri', $options)) { $other = RSVP::staticGet('uri', $options['uri']); if (!empty($other)) { + // TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond"). throw new ClientException(_m('RSVP already exists.')); } } @@ -149,6 +147,7 @@ class RSVP extends Managed_DataObject 'event_id' => $event->id)); if (!empty($other)) { + // TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond"). throw new ClientException(_m('RSVP already exists.')); } @@ -179,7 +178,7 @@ class RSVP extends Managed_DataObject // XXX: come up with something sexier $content = $rsvp->asString(); - + $rendered = $rsvp->asHTML(); $options = array_merge(array('object_type' => $verb), @@ -217,7 +216,8 @@ class RSVP extends Managed_DataObject return '?'; break; default: - throw new Exception(sprintf(_m('Unknown verb "%s"'),$verb)); + // TRANS: Exception thrown when requesting an undefined verb for RSVP. + throw new Exception(sprintf(_m('Unknown verb "%s".'),$verb)); } } @@ -234,6 +234,7 @@ class RSVP extends Managed_DataObject return RSVP::POSSIBLE; break; default: + // TRANS: Exception thrown when requesting an undefined code for RSVP. throw new Exception(sprintf(_m('Unknown code "%s".'),$code)); } } @@ -242,6 +243,8 @@ class RSVP extends Managed_DataObject { $notice = Notice::staticGet('uri', $this->uri); if (empty($notice)) { + // TRANS: Server exception thrown when requesting a non-exsting notice for an RSVP ("please respond"). + // TRANS: %s is the RSVP with the missing notice. throw new ServerException(sprintf(_m('RSVP %s does not correspond to a notice in the database.'),$this->id)); } return $notice; @@ -297,6 +300,8 @@ class RSVP extends Managed_DataObject { $profile = Profile::staticGet('id', $this->profile_id); if (empty($profile)) { + // TRANS: Exception thrown when requesting a non-existing profile. + // TRANS: %s is the ID of the non-existing profile. throw new Exception(sprintf(_m('No profile with ID %s.'),$this->profile_id)); } return $profile; @@ -306,6 +311,8 @@ class RSVP extends Managed_DataObject { $event = Happening::staticGet('id', $this->event_id); if (empty($event)) { + // TRANS: Exception thrown when requesting a non-existing event. + // TRANS: %s is the ID of the non-existing event. throw new Exception(sprintf(_m('No event with ID %s.'),$this->event_id)); } return $event; @@ -335,21 +342,34 @@ class RSVP extends Managed_DataObject switch ($response) { case 'Y': + // TRANS: HTML version of an RSVP ("please respond") status for a user. + // TRANS: %1$s is a profile URL, %2$s a profile name, + // TRANS: %3$s is an event URL, %4$s an event title. $fmt = _m("%2\$s is attending %4\$s."); break; case 'N': + // TRANS: HTML version of an RSVP ("please respond") status for a user. + // TRANS: %1$s is a profile URL, %2$s a profile name, + // TRANS: %3$s is an event URL, %4$s an event title. $fmt = _m("%2\$s is not attending %4\$s."); break; case '?': + // TRANS: HTML version of an RSVP ("please respond") status for a user. + // TRANS: %1$s is a profile URL, %2$s a profile name, + // TRANS: %3$s is an event URL, %4$s an event title. $fmt = _m("%2\$s might attend %4\$s."); break; default: + // TRANS: Exception thrown when requesting a user's RSVP status for a non-existing response code. + // TRANS: %s is the non-existing response code. throw new Exception(sprintf(_m('Unknown response code %s.'),$response)); break; } if (empty($event)) { $eventUrl = '#'; + // TRANS: Used as event title when not event title is available. + // TRANS: Used as: Username [is [not ] attending|might attend] an unknown event. $eventTitle = _m('an unknown event'); } else { $notice = $event->getNotice(); @@ -370,20 +390,30 @@ class RSVP extends Managed_DataObject switch ($response) { case 'Y': + // TRANS: Plain text version of an RSVP ("please respond") status for a user. + // TRANS: %1$s is a profile name, %2$s is an event title. $fmt = _m('%1$s is attending %2$s.'); break; case 'N': + // TRANS: Plain text version of an RSVP ("please respond") status for a user. + // TRANS: %1$s is a profile name, %2$s is an event title. $fmt = _m('%1$s is not attending %2$s.'); break; case '?': + // TRANS: Plain text version of an RSVP ("please respond") status for a user. + // TRANS: %1$s is a profile name, %2$s is an event title. $fmt = _m('%1$s might attend %2$s.'); break; default: + // TRANS: Exception thrown when requesting a user's RSVP status for a non-existing response code. + // TRANS: %s is the non-existing response code. throw new Exception(sprintf(_m('Unknown response code %s.'),$response)); break; } if (empty($event)) { + // TRANS: Used as event title when not event title is available. + // TRANS: Used as: Username [is [not ] attending|might attend] an unknown event. $eventTitle = _m('an unknown event'); } else { $notice = $event->getNotice(); diff --git a/plugins/Event/cancelrsvp.php b/plugins/Event/cancelrsvp.php index 94f78bfca6..6b0ddb2287 100644 --- a/plugins/Event/cancelrsvp.php +++ b/plugins/Event/cancelrsvp.php @@ -4,7 +4,7 @@ * Copyright (C) 2011, StatusNet, Inc. * * Cancel the RSVP for an event - * + * * PHP version 5 * * This program is free software: you can redistribute it and/or modify @@ -27,6 +27,7 @@ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ + if (!defined('STATUSNET')) { // This check helps protect against security problems; // your code file can't be executed directly from the web. @@ -43,7 +44,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class CancelrsvpAction extends Action { protected $user = null; @@ -55,10 +55,10 @@ class CancelrsvpAction extends Action * * @return string Action title */ - function title() { - return _m('Cancel RSVP'); + // TRANS: Title for RSVP ("please respond") action. + return _m('TITLE','Cancel RSVP'); } /** @@ -68,7 +68,6 @@ class CancelrsvpAction extends Action * * @return boolean true */ - function prepare($argarray) { parent::prepare($argarray); @@ -79,24 +78,28 @@ class CancelrsvpAction extends Action $rsvpId = $this->trimmed('rsvp'); if (empty($rsvpId)) { + // TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item. throw new ClientException(_m('No such RSVP.')); } $this->rsvp = RSVP::staticGet('id', $rsvpId); if (empty($this->rsvp)) { + // TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item. throw new ClientException(_m('No such RSVP.')); } $this->event = Happening::staticGet('id', $this->rsvp->event_id); if (empty($this->event)) { + // TRANS: Client exception thrown when referring to a non-existing event. throw new ClientException(_m('No such event.')); } $this->user = common_current_user(); if (empty($this->user)) { + // TRANS: Client exception thrown when trying tp RSVP ("please respond") while not logged in. throw new ClientException(_m('You must be logged in to RSVP for an event.')); } @@ -110,7 +113,6 @@ class CancelrsvpAction extends Action * * @return void */ - function handle($argarray=null) { parent::handle($argarray); @@ -129,7 +131,6 @@ class CancelrsvpAction extends Action * * @return void */ - function cancelRSVP() { try { @@ -171,7 +172,6 @@ class CancelrsvpAction extends Action * * @return void */ - function showContent() { if (!empty($this->error)) { @@ -194,7 +194,6 @@ class CancelrsvpAction extends Action * * @return boolean is read only action? */ - function isReadOnly($args) { if ($_SERVER['REQUEST_METHOD'] == 'GET' || diff --git a/plugins/Event/cancelrsvpform.php b/plugins/Event/cancelrsvpform.php index 14161d1897..107351135a 100644 --- a/plugins/Event/cancelrsvpform.php +++ b/plugins/Event/cancelrsvpform.php @@ -4,7 +4,7 @@ * Copyright (C) 2011, StatusNet, Inc. * * Form to RSVP for an event - * + * * PHP version 5 * * This program is free software: you can redistribute it and/or modify @@ -44,7 +44,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class CancelRSVPForm extends Form { protected $rsvp = null; @@ -60,7 +59,6 @@ class CancelRSVPForm extends Form * * @return int ID of the form */ - function id() { return 'form_event_rsvp'; @@ -71,7 +69,6 @@ class CancelRSVPForm extends Form * * @return string class of the form */ - function formClass() { return 'ajax'; @@ -82,7 +79,6 @@ class CancelRSVPForm extends Form * * @return string URL of the action */ - function action() { return common_local_url('cancelrsvp'); @@ -93,7 +89,6 @@ class CancelRSVPForm extends Form * * @return void */ - function formData() { $this->out->elementStart('fieldset', array('id' => 'new_rsvp_data')); @@ -102,12 +97,15 @@ class CancelRSVPForm extends Form switch (RSVP::verbFor($this->rsvp->response)) { case RSVP::POSITIVE: + // TRANS: Possible status for RSVP ("please respond") item. $this->out->text(_m('You will attend this event.')); break; case RSVP::NEGATIVE: + // TRANS: Possible status for RSVP ("please respond") item. $this->out->text(_m('You will not attend this event.')); break; case RSVP::POSSIBLE: + // TRANS: Possible status for RSVP ("please respond") item. $this->out->text(_m('You might attend this event.')); break; } @@ -120,9 +118,9 @@ class CancelRSVPForm extends Form * * @return void */ - function formActions() { + // TRANS: Button text to cancel responding to an RSVP ("please respond") item. $this->out->submit('cancel', _m('BUTTON', 'Cancel')); } } diff --git a/plugins/Event/event.css b/plugins/Event/event.css index a922bb5791..8c9cbbb082 100644 --- a/plugins/Event/event.css +++ b/plugins/Event/event.css @@ -6,4 +6,3 @@ .event-title { margin-left: 0px; } #content .event .entry-title { margin-left: 0px; } #content .event .entry-content { margin-left: 0px; } - diff --git a/plugins/Event/eventform.php b/plugins/Event/eventform.php index 9c9a86229b..832604a31d 100644 --- a/plugins/Event/eventform.php +++ b/plugins/Event/eventform.php @@ -4,7 +4,7 @@ * Copyright (C) 2011, StatusNet, Inc. * * Form for entering an event - * + * * PHP version 5 * * This program is free software: you can redistribute it and/or modify @@ -44,7 +44,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class EventForm extends Form { /** @@ -52,7 +51,6 @@ class EventForm extends Form * * @return int ID of the form */ - function id() { return 'form_new_event'; @@ -63,7 +61,6 @@ class EventForm extends Form * * @return string class of the form */ - function formClass() { return 'form_settings ajax-notice'; @@ -74,7 +71,6 @@ class EventForm extends Form * * @return string URL of the action */ - function action() { return common_local_url('newevent'); @@ -85,7 +81,6 @@ class EventForm extends Form * * @return void */ - function formData() { $this->out->elementStart('fieldset', array('id' => 'new_bookmark_data')); @@ -93,57 +88,73 @@ class EventForm extends Form $this->li(); $this->out->input('title', + // TRANS: Field label on event form. _m('LABEL','Title'), null, + // TRANS: Field title on event form. _m('Title of the event.')); $this->unli(); $this->li(); $this->out->input('startdate', + // TRANS: Field label on event form. _m('LABEL','Start date'), null, + // TRANS: Field title on event form. _m('Date the event starts.')); $this->unli(); $this->li(); $this->out->input('starttime', + // TRANS: Field label on event form. _m('LABEL','Start time'), null, + // TRANS: Field title on event form. _m('Time the event starts.')); $this->unli(); $this->li(); $this->out->input('enddate', + // TRANS: Field label on event form. _m('LABEL','End date'), - null, + null, + // TRANS: Field title on event form. _m('Date the event ends.')); $this->unli(); $this->li(); $this->out->input('endtime', + // TRANS: Field label on event form. _m('LABEL','End time'), null, + // TRANS: Field title on event form. _m('Time the event ends.')); $this->unli(); $this->li(); $this->out->input('location', + // TRANS: Field label on event form. _m('LABEL','Location'), null, + // TRANS: Field title on event form. _m('Event location.')); $this->unli(); $this->li(); $this->out->input('url', + // TRANS: Field label on event form. _m('LABEL','URL'), null, + // TRANS: Field title on event form. _m('URL for more information.')); $this->unli(); $this->li(); $this->out->input('description', + // TRANS: Field label on event form. _m('LABEL','Description'), null, + // TRANS: Field title on event form. _m('Description of the event.')); $this->unli(); @@ -162,9 +173,9 @@ class EventForm extends Form * * @return void */ - function formActions() { + // TRANS: Button text to save an event.. $this->out->submit('submit', _m('BUTTON', 'Save')); } } diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php index 93baa37b6b..cadf0e1433 100644 --- a/plugins/Event/newevent.php +++ b/plugins/Event/newevent.php @@ -4,7 +4,7 @@ * Copyright (C) 2011, StatusNet, Inc. * * Add a new event - * + * * PHP version 5 * * This program is free software: you can redistribute it and/or modify @@ -27,6 +27,7 @@ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ + if (!defined('STATUSNET')) { // This check helps protect against security problems; // your code file can't be executed directly from the web. @@ -43,7 +44,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class NeweventAction extends Action { protected $user = null; @@ -60,10 +60,10 @@ class NeweventAction extends Action * * @return string Action title */ - function title() { - return _m('New event'); + // TRANS: Title for new event form. + return _m('TITLE','New event'); } /** @@ -73,7 +73,6 @@ class NeweventAction extends Action * * @return boolean true */ - function prepare($argarray) { parent::prepare($argarray); @@ -81,6 +80,7 @@ class NeweventAction extends Action $this->user = common_current_user(); if (empty($this->user)) { + // TRANS: Client exception thrown when trying to post an event while not logged in. throw new ClientException(_m('Must be logged in to post a event.'), 403); } @@ -92,6 +92,7 @@ class NeweventAction extends Action $this->title = $this->trimmed('title'); if (empty($this->title)) { + // TRANS: Client exception thrown when trying to post an event without providing a title. throw new ClientException(_m('Title required.')); } @@ -102,6 +103,7 @@ class NeweventAction extends Action $startDate = $this->trimmed('startdate'); if (empty($startDate)) { + // TRANS: Client exception thrown when trying to post an event without providing a start date. throw new ClientException(_m('Start date required.')); } @@ -114,6 +116,7 @@ class NeweventAction extends Action $endDate = $this->trimmed('enddate'); if (empty($endDate)) { + // TRANS: Client exception thrown when trying to post an event without providing an end date. throw new ClientException(_m('End date required.')); } @@ -135,12 +138,16 @@ class NeweventAction extends Action $this->endTime = strtotime($end); if ($this->startTime == 0) { + // TRANS: Client exception thrown when trying to post an event with a date that cannot be processed. + // TRANS: %s is the data that could not be processed. throw new Exception(sprintf(_m('Could not parse date "%s".'), $start)); } if ($this->endTime == 0) { + // TRANS: Client exception thrown when trying to post an event with a date that cannot be processed. + // TRANS: %s is the data that could not be processed. throw new Exception(sprintf(_m('Could not parse date "%s".'), $end)); } @@ -155,7 +162,6 @@ class NeweventAction extends Action * * @return void */ - function handle($argarray=null) { parent::handle($argarray); @@ -174,19 +180,21 @@ class NeweventAction extends Action * * @return void */ - function newEvent() { try { if (empty($this->title)) { + // TRANS: Client exception thrown when trying to post an event without providing a title. throw new ClientException(_m('Event must have a title.')); } if (empty($this->startTime)) { + // TRANS: Client exception thrown when trying to post an event without providing a start time. throw new ClientException(_m('Event must have a start time.')); } if (empty($this->endTime)) { + // TRANS: Client exception thrown when trying to post an event without providing an end time. throw new ClientException(_m('Event must have an end time.')); } @@ -195,7 +203,7 @@ class NeweventAction extends Action // Does the heavy-lifting for getting "To:" information ToSelector::fillOptions($this, $options); - + $profile = $this->user->getProfile(); $saved = Happening::saveNew($profile, @@ -239,7 +247,6 @@ class NeweventAction extends Action * * @return void */ - function showContent() { if (!empty($this->error)) { @@ -262,7 +269,6 @@ class NeweventAction extends Action * * @return boolean is read only action? */ - function isReadOnly($args) { if ($_SERVER['REQUEST_METHOD'] == 'GET' || diff --git a/plugins/Event/newrsvp.php b/plugins/Event/newrsvp.php index cb7f72d49c..b000767340 100644 --- a/plugins/Event/newrsvp.php +++ b/plugins/Event/newrsvp.php @@ -4,7 +4,7 @@ * Copyright (C) 2011, StatusNet, Inc. * * RSVP for an event - * + * * PHP version 5 * * This program is free software: you can redistribute it and/or modify @@ -27,6 +27,7 @@ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ + if (!defined('STATUSNET')) { // This check helps protect against security problems; // your code file can't be executed directly from the web. @@ -43,7 +44,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class NewrsvpAction extends Action { protected $user = null; @@ -55,10 +55,10 @@ class NewrsvpAction extends Action * * @return string Action title */ - function title() { - return _m('New RSVP'); + // TRANS: Title for RSVP ("please respond") action. + return _m('TITLE','New RSVP'); } /** @@ -68,7 +68,6 @@ class NewrsvpAction extends Action * * @return boolean true */ - function prepare($argarray) { parent::prepare($argarray); @@ -79,18 +78,21 @@ class NewrsvpAction extends Action $eventId = $this->trimmed('event'); if (empty($eventId)) { + // TRANS: Client exception thrown when requesting a non-exsting event. throw new ClientException(_m('No such event.')); } $this->event = Happening::staticGet('id', $eventId); if (empty($this->event)) { + // TRANS: Client exception thrown when requesting a non-exsting event. throw new ClientException(_m('No such event.')); } $this->user = common_current_user(); if (empty($this->user)) { + // TRANS: Client exception thrown when trying to RSVP ("please respond") while not logged in. throw new ClientException(_m('You must be logged in to RSVP for an event.')); } @@ -107,7 +109,8 @@ class NewrsvpAction extends Action $this->verb = RSVP::POSSIBLE; break; default: - throw new ClientException('Unknown submit value.'); + // TRANS: Client exception thrown when using an invalud value for RSVP ("please respond"). + throw new ClientException(_('Unknown submit value.')); } return true; @@ -120,7 +123,6 @@ class NewrsvpAction extends Action * * @return void */ - function handle($argarray=null) { parent::handle($argarray); @@ -139,7 +141,6 @@ class NewrsvpAction extends Action * * @return void */ - function newRSVP() { try { @@ -158,7 +159,7 @@ class NewrsvpAction extends Action $this->xw->startDocument('1.0', 'UTF-8'); $this->elementStart('html'); $this->elementStart('head'); - // TRANS: Page title after sending a notice. + // TRANS: Page title after creating an event. $this->element('title', null, _m('Event saved')); $this->elementEnd('head'); $this->elementStart('body'); @@ -178,7 +179,6 @@ class NewrsvpAction extends Action * * @return void */ - function showContent() { if (!empty($this->error)) { @@ -201,7 +201,6 @@ class NewrsvpAction extends Action * * @return boolean is read only action? */ - function isReadOnly($args) { if ($_SERVER['REQUEST_METHOD'] == 'GET' || diff --git a/plugins/Event/rsvpform.php b/plugins/Event/rsvpform.php index 494e64929f..6f86004f94 100644 --- a/plugins/Event/rsvpform.php +++ b/plugins/Event/rsvpform.php @@ -4,7 +4,7 @@ * Copyright (C) 2011, StatusNet, Inc. * * Form to RSVP for an event - * + * * PHP version 5 * * This program is free software: you can redistribute it and/or modify @@ -44,7 +44,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class RSVPForm extends Form { protected $event = null; @@ -60,7 +59,6 @@ class RSVPForm extends Form * * @return int ID of the form */ - function id() { return 'form_event_rsvp'; @@ -71,7 +69,6 @@ class RSVPForm extends Form * * @return string class of the form */ - function formClass() { return 'ajax'; @@ -82,7 +79,6 @@ class RSVPForm extends Form * * @return string URL of the action */ - function action() { return common_local_url('newrsvp'); @@ -93,11 +89,11 @@ class RSVPForm extends Form * * @return void */ - function formData() { $this->out->elementStart('fieldset', array('id' => 'new_rsvp_data')); + // TRANS: Field label on form to RSVP ("please respond") for an event. $this->out->text(_m('RSVP:')); $this->out->hidden('event', $this->event->id); @@ -111,14 +107,16 @@ class RSVPForm extends Form * * @return void */ - function formActions() { + // TRANS: Button text for RSVP ("please respond") reply to confirm attendence. $this->submitButton('yes', _m('BUTTON', 'Yes')); + // TRANS: Button text for RSVP ("please respond") reply to deny attendence. $this->submitButton('no', _m('BUTTON', 'No')); + // TRANS: Button text for RSVP ("please respond") reply to indicate one might attend. $this->submitButton('maybe', _m('BUTTON', 'Maybe')); } - + function submitButton($id, $label) { $this->out->element('input', array('type' => 'submit', diff --git a/plugins/Event/showevent.php b/plugins/Event/showevent.php index e5afd47d00..52e17f860a 100644 --- a/plugins/Event/showevent.php +++ b/plugins/Event/showevent.php @@ -4,7 +4,7 @@ * Copyright (C) 2011, StatusNet, Inc. * * Show a single event - * + * * PHP version 5 * * This program is free software: you can redistribute it and/or modify diff --git a/plugins/Event/showrsvp.php b/plugins/Event/showrsvp.php index 7b129177e1..da80448af8 100644 --- a/plugins/Event/showrsvp.php +++ b/plugins/Event/showrsvp.php @@ -4,7 +4,7 @@ * Copyright (C) 2010, StatusNet, Inc. * * Show a single RSVP - * + * * PHP version 5 * * This program is free software: you can redistribute it and/or modify