eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Brion Vibber 2011-03-07 12:20:11 -08:00
parent 0c2289fb2f 985ff92431
commit f4f4e7499f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/personalgroupnav.php
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));