Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / lib / personalgroupnav.php

diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 533e9f43d230822d8a95d740b492bae992f26bab..72d0893af732a3574b1593e5c70a41befc608338 100644 (file)
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -76,7 +76,7 @@ class PersonalGroupNav extends Widget
     {
         $user = null;
 
-       // FIXME: we should probably pass this in
+        // FIXME: we should probably pass this in
 
         $action = $this->action->trimmed('action');
         $nickname = $this->action->trimmed('nickname');
@@ -95,32 +95,20 @@ class PersonalGroupNav extends Widget
 
         if (Event::handle('StartPersonalGroupNav', array($this))) {
             $this->out->menuItem(common_local_url('all', array('nickname' =>
-                                                           $nickname)),
-                             // TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-                             _m('MENU','Personal'),
-                             // TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
-                             sprintf(_('%s and friends'), $name),
-                             $action == 'all', 'nav_timeline_personal');
+                                                               $nickname)),
+                                 _('Home'),
+                                 sprintf(_('%s and friends'), $name),
+                                 $action == 'all', 'nav_timeline_personal');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>
-                                                                  $nickname)),
-                             // TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-                             _m('MENU','Replies'),
-                             // TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
-                             sprintf(_('Replies to %s'), $name),
-                             $action == 'replies', 'nav_timeline_replies');
-            $this->out->menuItem(common_local_url('showstream', array('nickname' =>
-                                                                  $nickname)),
-                             // TRANS: Personal group navigation menu option when logged in for seeing own profile.
-                             _m('MENU','Profile'),
-                             $name,
-                             $action == 'showstream', 'nav_profile');
+                                                                   $nickname)),
+                                 _('Replies'),
+                                 sprintf(_('Replies to %s'), $name),
+                                 $action == 'replies', 'nav_timeline_replies');
             $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
-                                                                  $nickname)),
-                             // TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-                             _m('MENU','Favorites'),
-                             // TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
-                             sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
-                             $action == 'showfavorites', 'nav_timeline_favorites');
+                                                                         $nickname)),
+                                 _('Favorites'),
+                                 sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
+                                 $action == 'showfavorites', 'nav_timeline_favorites');
 
             $cur = common_current_user();
 
@@ -128,19 +116,15 @@ class PersonalGroupNav extends Widget
                 !common_config('singleuser', 'enabled')) {
 
                 $this->out->menuItem(common_local_url('inbox', array('nickname' =>
-                                                                         $nickname)),
-                                 // TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-                                 _m('MENU','Inbox'),
-                                 // TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-                                 _('Your incoming messages'),
-                                 $action == 'inbox');
+                                                                     $nickname)),
+                                     _('Inbox'),
+                                     _('Your incoming messages'),
+                                     $action == 'inbox');
                 $this->out->menuItem(common_local_url('outbox', array('nickname' =>
-                                                                         $nickname)),
-                                 // TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-                                 _m('MENU','Outbox'),
-                                 // TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-                                 _('Your sent messages'),
-                                 $action == 'outbox');
+                                                                      $nickname)),
+                                     _('Outbox'),
+                                     _('Your sent messages'),
+                                     $action == 'outbox');
             }
             Event::handle('EndPersonalGroupNav', array($this));
         }