Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

This commit is contained in:
Evan Prodromou 2011-03-07 15:12:51 -05:00
commit f8427f3d1e

View File

@ -70,23 +70,23 @@ class PersonalGroupNav extends Menu
$nickname)), $nickname)),
_('Home'), _('Home'),
sprintf(_('%s and friends'), $name), sprintf(_('%s and friends'), $name),
$action == 'all', 'nav_timeline_personal'); $this->action == 'all', 'nav_timeline_personal');
$this->out->menuItem(common_local_url('showstream', array('nickname' => $this->out->menuItem(common_local_url('showstream', array('nickname' =>
$nickname)), $nickname)),
_('Profile'), _('Profile'),
_('Your profile'), _('Your profile'),
$action == 'showstream', $this->action == 'showstream',
'nav_profile'); 'nav_profile');
$this->out->menuItem(common_local_url('replies', array('nickname' => $this->out->menuItem(common_local_url('replies', array('nickname' =>
$nickname)), $nickname)),
_('Replies'), _('Replies'),
sprintf(_('Replies to %s'), $name), sprintf(_('Replies to %s'), $name),
$action == 'replies', 'nav_timeline_replies'); $this->action == 'replies', 'nav_timeline_replies');
$this->out->menuItem(common_local_url('showfavorites', array('nickname' => $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
$nickname)), $nickname)),
_('Favorites'), _('Favorites'),
sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')), sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
$action == 'showfavorites', 'nav_timeline_favorites'); $this->action == 'showfavorites', 'nav_timeline_favorites');
$cur = common_current_user(); $cur = common_current_user();
@ -97,7 +97,7 @@ class PersonalGroupNav extends Menu
$nickname)), $nickname)),
_('Messages'), _('Messages'),
_('Your incoming messages'), _('Your incoming messages'),
$action == 'inbox'); $this->action == 'inbox');
} }
Event::handle('EndPersonalGroupNav', array($this)); Event::handle('EndPersonalGroupNav', array($this));