X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fall.php;h=2826319c0d9e59ffc56c0de40e9d561efdc418f0;hb=e5133f8150910fa30a7f1f122be34a37478e938d;hp=2c96298fafd41e8582ba56c7acaf3fe5c918ead8;hpb=c899e4a84ee45b65950980ccb87e52129871d58e;p=quix0rs-gnu-social.git diff --git a/actions/all.php b/actions/all.php index 2c96298faf..2826319c0d 100644 --- a/actions/all.php +++ b/actions/all.php @@ -18,15 +18,19 @@ * * @category Actions * @package Actions - * @author Evan Prodromou - * @author Mike Cochrane - * @author Robin Millette * @author Adrian Lang - * @author Meitar Moscovitz - * @author Sarven Capadisli + * @author Brenda Wallace + * @author Brion Vibber * @author Craig Andrews + * @author Evan Prodromou * @author Jeffery To - * @author Zach Copley + * @author Meitar Moscovitz + * @author Mike Cochrane + * @author Robin Millette + * @author Sarven Capadisli + * @author Siebrand Mazeland + * @author Zach Copley + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license GNU Affero General Public License http://www.gnu.org/licenses/ * @link http://status.net */ @@ -54,13 +58,14 @@ class AllAction extends ProfileAction $cur = common_current_user(); if (!empty($cur) && $cur->id == $this->user->id) { - $this->notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + $this->notice = $this->user->noticeInboxThreaded(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); } else { - $this->notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + $this->notice = $this->user->noticesWithFriendsThreaded(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); } if ($this->page > 1 && $this->notice->N == 0) { - $this->serverError(_('No such page'), $code = 404); + // TRANS: Server error when page not found (404). + $this->serverError(_('No such page.'), $code = 404); } return true; @@ -71,6 +76,7 @@ class AllAction extends ProfileAction parent::handle($args); if (!$this->user) { + // TRANS: Client error when user not found for an action. $this->clientError(_('No such user.')); return; } @@ -81,8 +87,10 @@ class AllAction extends ProfileAction function title() { if ($this->page > 1) { - return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page); + // TRANS: Page title. %1$s is user nickname, %2$d is page number + return sprintf(_('%1$s and friends, page %2$d'), $this->user->nickname, $this->page); } else { + // TRANS: Page title. %s is user nickname return sprintf(_("%s and friends"), $this->user->nickname); } } @@ -96,6 +104,7 @@ class AllAction extends ProfileAction 'nickname' => $this->user->nickname) ), + // TRANS: %s is user nickname. sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)), new Feed(Feed::RSS2, common_local_url( @@ -104,6 +113,7 @@ class AllAction extends ProfileAction 'id' => $this->user->nickname ) ), + // TRANS: %s is user nickname. sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)), new Feed(Feed::ATOM, common_local_url( @@ -112,29 +122,31 @@ class AllAction extends ProfileAction 'id' => $this->user->nickname ) ), + // TRANS: %s is user nickname. sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname)) ); } - function showLocalNav() - { - $nav = new PersonalGroupNav($this); - $nav->show(); - } - function showEmptyListMessage() { + // TRANS: Empty list message. %s is a user nickname. $message = sprintf(_('This is the timeline for %s and friends but no one has posted anything yet.'), $this->user->nickname) . ' '; if (common_logged_in()) { $current_user = common_current_user(); if ($this->user->id === $current_user->id) { + // TRANS: Encouragement displayed on logged in user's empty timeline. + // TRANS: This message contains Markdown links. Keep "](" together. $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.'); } else { - $message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); + // TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@". + // TRANS: This message contains Markdown links. Keep "](" together. + $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from their profile or [post something to them](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); } } else { - $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname); + // TRANS: Encoutagement displayed on empty timeline user pages for anonymous users. + // TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together. + $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->user->nickname); } $this->elementStart('div', 'guide'); @@ -144,111 +156,33 @@ class AllAction extends ProfileAction function showContent() { - $nl = new InboxNoticeList($this->notice, $this->user, $this); + if (Event::handle('StartShowAllContent', array($this))) { + $nl = new ThreadedNoticeList($this->notice, $this); - $cnt = $nl->show(); + $cnt = $nl->show(); - if (0 == $cnt) { - $this->showEmptyListMessage(); - } + if (0 == $cnt) { + $this->showEmptyListMessage(); + } - $this->pagination( - $this->page > 1, $cnt > NOTICES_PER_PAGE, - $this->page, 'all', array('nickname' => $this->user->nickname) - ); + $this->pagination( + $this->page > 1, $cnt > NOTICES_PER_PAGE, + $this->page, 'all', array('nickname' => $this->user->nickname) + ); + + Event::handle('EndShowAllContent', array($this)); + } } function showPageTitle() { $user = common_current_user(); if ($user && ($user->id == $this->user->id)) { + // TRANS: H1 text for page when viewing a list for self. $this->element('h1', null, _("You and friends")); } else { + // TRANS: H1 text for page. %s is a user nickname. $this->element('h1', null, sprintf(_('%s and friends'), $this->user->nickname)); } } } - -class InboxNoticeList extends NoticeList -{ - var $owner = null; - - function __construct($notice, $owner, $out=null) - { - parent::__construct($notice, $out); - $this->owner = $owner; - } - - function newListItem($notice) - { - return new InboxNoticeListItem($notice, $this->owner, $this->out); - } -} - -class InboxNoticeListItem extends NoticeListItem -{ - var $owner = null; - var $ib = null; - - function __construct($notice, $owner, $out=null) - { - parent::__construct($notice, $out); - $this->owner = $owner; - - $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id, - 'notice_id' => $notice->id)); - } - - function showAuthor() - { - parent::showAuthor(); - if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { - $this->out->element('span', 'forward', _('Fwd')); - } - } - - function showEnd() - { - if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { - - $forward = new Forward(); - - // FIXME: scary join! - - $forward->query('SELECT profile_id '. - 'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '. - 'WHERE subscription.subscriber = ' . $this->owner->id . ' '. - 'AND forward.notice_id = ' . $this->notice->id . ' '. - 'ORDER BY forward.created '); - - $n = 0; - - $firstForwarder = null; - - while ($forward->fetch()) { - if (empty($firstForwarder)) { - $firstForwarder = Profile::staticGet('id', $forward->profile_id); - } - $n++; - } - - $forward->free(); - unset($forward); - - $this->out->elementStart('span', 'forwards'); - - $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl), - $firstForwarder->nickname); - - if ($n == 1) { - $this->out->raw(sprintf(_('Forwarded by %s'), $link)); - } else { - // XXX: use that cool ngettext thing - $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1)); - } - - $this->out->elementEnd('span'); - } - parent::showEnd(); - } -}