From f06f8d51fdd8f204209d87682e8f9a3de98115b1 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 27 Mar 2011 12:58:35 +0200 Subject: [PATCH 1/3] Slightly uncomplicate and disambiguate the plugin description. Add translator documentation. --- plugins/Comet/CometPlugin.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php index 70b324b5c2..c8072ac190 100644 --- a/plugins/Comet/CometPlugin.php +++ b/plugins/Comet/CometPlugin.php @@ -111,7 +111,9 @@ class CometPlugin extends RealtimePlugin 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Comet', 'rawdescription' => - _m('Plugin to do "real time" updates using Comet/Bayeux.')); + // TRANS: Plugin description message. Bayeux is a protocol for transporting asynchronous messages + // TRANS: and Comet is a web application model. + _m('Plugin to make updates using Comet and Bayeux.')); return true; } } From 1adaa6a2abc0f51f0b8853368c1919f5a9c3834b Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 27 Mar 2011 13:05:24 +0200 Subject: [PATCH 2/3] Update grammar for feed title. Not sure why this was not "%s's". I chose the safe, more verbose way. --- actions/atompubmembershipfeed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php index f7882d97d3..0a53331280 100644 --- a/actions/atompubmembershipfeed.php +++ b/actions/atompubmembershipfeed.php @@ -141,7 +141,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction // TRANS: Title for group membership feed. // TRANS: %s is a username. - $feed->setTitle(sprintf(_("%s group memberships"), + $feed->setTitle(sprintf(_('Group memberships of %s'), $this->_profile->getBestName())); // TRANS: Subtitle for group membership feed. From c7defb32f939c1b9555499e28fb170cc218cb953 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 27 Mar 2011 11:25:24 -0400 Subject: [PATCH 3/3] NoticeForm constructor takes array of optional parameters NoticeForm::__construct() had 9 parameters, and I was about to add a few more, so I figured it'd be better to use an $options array instead. --- actions/newnotice.php | 4 +++- lib/noticeform.php | 51 ++++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/actions/newnotice.php b/actions/newnotice.php index 3e601ae362..7f697e23f3 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -344,7 +344,9 @@ class NewnoticeAction extends Action $inreplyto = null; } - $notice_form = new NoticeForm($this, '', $content, null, $inreplyto); + $notice_form = new NoticeForm($this, array('content' => $content, + 'inreplyto' => $inreplyto)); + $notice_form->show(); } diff --git a/lib/noticeform.php b/lib/noticeform.php index 3909b088d0..2cbacc9280 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -53,7 +53,7 @@ class NoticeForm extends Form /** * Current action, used for returning to this page. */ - var $action = null; + var $actionName = null; /** * Pre-filled content of the form @@ -82,26 +82,43 @@ class NoticeForm extends Form /** * Constructor * - * @param HTMLOutputter $out output channel - * @param string $action action to return to, if any - * @param string $content content to pre-fill + * @param Action $action Action we're being embedded into + * @param array $options Array of optional parameters + * 'user' a user instead of current + * 'content' notice content + * 'inreplyto' ID of notice to reply to + * 'lat' Latitude + * 'lon' Longitude + * 'location_id' ID of location + * 'location_ns' Namespace of location */ - function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto=null, $lat=null, $lon=null, $location_id=null, $location_ns=null) + function __construct($action, $options=null) { + // XXX: ??? Is this to keep notice forms distinct? + // Do we have to worry about sub-second race conditions? + // XXX: Needs to be above the parent::__construct() call...? + $this->id_suffix = time(); - parent::__construct($out); + parent::__construct($action); - $this->action = $action; - $this->content = $content; - $this->inreplyto = $inreplyto; - $this->lat = $lat; - $this->lon = $lon; - $this->location_id = $location_id; - $this->location_ns = $location_ns; + if (is_null($options)) { + $options = array(); + } - if ($user) { - $this->user = $user; + $this->actionName = $action->trimmed('action'); + + $prefill = array('content', 'inreplyto', 'lat', + 'lon', 'location_id', 'location_ns'); + + foreach ($prefill as $fieldName) { + if (array_key_exists($fieldName, $options)) { + $this->$fieldName = $options[$fieldName]; + } + } + + if (array_key_exists('user', $options)) { + $this->user = $options['user']; } else { $this->user = common_current_user(); } @@ -196,8 +213,8 @@ class NoticeForm extends Form 'title' => _('Attach a file.'))); $this->out->elementEnd('label'); } - if ($this->action) { - $this->out->hidden('notice_return-to', $this->action, 'returnto'); + if (!empty($this->actionName)) { + $this->out->hidden('notice_return-to', $this->actionName, 'returnto'); } $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');