Misses this file to merge. I like the comments.

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

diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php
index 75c9a71c7ba176f4b03e8d83cdd570bb57aaefa7..40447dd41a26a7a599abf3df8776771795f8dd95 100644 (file)
--- a/lib/subgroupnav.php
+++ b/lib/subgroupnav.php
@@ -50,8 +50,9 @@ class SubGroupNav extends Menu
      * Construction
      *
      * @param Action $action current action, used for output
+     * @param User   $user   Current user or NULL if "guest"
      */
-    function __construct($action=null, $user=null)
+    function __construct(Action $action=null, User $user=null)
     {
         parent::__construct($action);
         $this->user = $user;
@@ -108,6 +109,7 @@ class SubGroupNav extends Menu
                                                           array('nickname' =>
                                                                 $this->user->nickname)),
                                          // TRANS: Menu item in local navigation menu.
+                                         // TRANS: %d is the number of pending subscription requests.
                                          sprintf(_m('MENU','Pending (%d)'), $pending),
                                          // TRANS: Menu item title in local navigation menu.
                                          sprintf(_('Approve pending subscription requests.'),
@@ -127,13 +129,16 @@ class SubGroupNav extends Menu
                                          $this->user->nickname),
                                  $action == 'usergroups',
                                  'nav_usergroups');
-            $this->out->menuItem(common_local_url('peopletagsbyuser',
+            $this->out->menuItem(common_local_url('peopletagsubscriptions',
                                                   array('nickname' =>
                                                         $this->user->nickname)),
-                                 _('People tags'),
-                                 sprintf(_('People tags by %s'),
+                                 // TRANS: Menu item title in local navigation menu.
+                                 _m('MENU','Lists'),
+                                 // TRANS: Menu item title in local navigation menu.
+                                 // TRANS: %s is a user nickname.
+                                 sprintf(_('List subscriptions by %s.'),
                                          $this->user->nickname),
-                                 in_array($action, array('peopletagsbyuser', 'peopletagsforuser')),
+                                 in_array($action, array('peopletagsbyuser', 'peopletagsubscriptions', 'peopletagsforuser')),
                                  'nav_timeline_peopletags');
 
             if (common_config('invite', 'enabled') && !is_null($cur) && $this->user->id === $cur->id) {
@@ -141,7 +146,7 @@ class SubGroupNav extends Menu
                                      // TRANS: Menu item in local navigation menu.
                                      _m('MENU','Invite'),
                                      // TRANS: Menu item title in local navigation menu.
-                                     // TRANS: %s is a user nickname.
+                                     // TRANS: %s is the StatusNet sitename.
                                      sprintf(_('Invite friends and colleagues to join you on %s.'),
                                              common_config('site', 'name')),
                                      $action == 'invite',