wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.0.x' into limitdist2

Browse Source
This commit is contained in:
Evan Prodromou 2011-03-27 11:36:57 -04:00
commit c1fd36c043
4 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/atompubmembershipfeed.php
View File

@ -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.

4
actions/newnotice.php
View File

@ -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();
}

51
lib/noticeform.php
View File

@ -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');

4
plugins/Comet/CometPlugin.php
View File

@ -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;
}
}