GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

work in progress

Browse Source
This commit is contained in:
Brion Vibber 2011-03-17 13:25:20 -07:00
parent 8ef9d75bbc
commit 6c236ab0ff
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/threadednoticelist.php
View File

@ -183,7 +183,7 @@ class ThreadedNoticeListItem extends NoticeListItem
if ($notices) { if ($notices) {
$this->out->elementStart('ul', 'notices threaded-replies xoxo'); $this->out->elementStart('ul', 'notices threaded-replies xoxo');
$item = new ThreadedNoticeListFavesItem($notice, $this->out); $item = new ThreadedNoticeListFavesItem($this->notice, $this->out);
$hasFaves = $item->show(); $hasFaves = $item->show();
if ($moreCutoff) { if ($moreCutoff) {
$item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out); $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out);
@ -196,7 +196,7 @@ class ThreadedNoticeListItem extends NoticeListItem
// @fixme do a proper can-post check that's consistent // @fixme do a proper can-post check that's consistent
// with the JS side // with the JS side
if (common_current_user()) { if (common_current_user()) {
$item = new ThreadedNoticeListReplyItem($notice, $this->out); $item = new ThreadedNoticeListReplyItem($this->notice, $this->out);
$item->show(); $item->show();
} }
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
@ -327,13 +327,6 @@ class ThreadedNoticeListFavesItem extends NoticeListItem
{ {
function show() function show()
{ {
return $this->showFaves();
}
function showFaves()
{
$this->out->text('(QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ)');
return 0;
// @fixme caching & scalability! // @fixme caching & scalability!
$fave = new Fave(); $fave = new Fave();
$fave->notice_id = $this->notice->id; $fave->notice_id = $this->notice->id;
@ -366,7 +359,13 @@ class ThreadedNoticeListFavesItem extends NoticeListItem
if ($links) { if ($links) {
$count = count($links); $count = count($links);
$msg = _m('%1$s has favored this notice', '%1$s have favored this notice', $count); if ($count == 1 && $you) {
// darn first person being different from third person!
$msg = _m('FAVELIST', 'You have favored this notice');
} else {
// if 'you' is the first item...
$msg = _m('FAVELIST', '%1$s has favored this notice', '%1$s have favored this notice', $count);
}
$out = sprintf($msg, implode(', ', $links)); $out = sprintf($msg, implode(', ', $links));
$this->out->elementStart('li', array('class' => 'notice-faves')); $this->out->elementStart('li', array('class' => 'notice-faves'));