Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline into merge-requests/165

Conflicts:
	lib/noticelist.php
This commit is contained in:
Evan Prodromou 2011-09-21 15:33:52 -04:00
commit 7d64d8c78c

View File

@ -603,6 +603,7 @@ class NoticeListItem extends Widget
// TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
$this->out->raw(_('Repeated by'));
$this->out->raw(_(' '));
$this->out->elementStart('a', $attrs);
$this->out->element('span', 'fn nickname', $repeater->nickname);