Merge branch 'fixes/private_scope_on_tags' into social-master

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

diff --git a/lib/peopletaggroupnav.php b/lib/peopletaggroupnav.php
index 2c9a65fd44ad530ea485bb5a575e947776003d58..212a90586b096e4289c79f461c6ea72a7e6c3a5d 100644 (file)
--- a/lib/peopletaggroupnav.php
+++ b/lib/peopletaggroupnav.php
@@ -52,7 +52,6 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @see      HTMLOutputter
  */
-
 class PeopletagGroupNav extends Widget
 {
     var $action = null;
@@ -62,8 +61,7 @@ class PeopletagGroupNav extends Widget
      *
      * @param Action $action current action, used for output
      */
-
-    function __construct($action=null)
+    function __construct(Action $action=null)
     {
         parent::__construct($action);
         $this->action = $action;
@@ -74,7 +72,6 @@ class PeopletagGroupNav extends Widget
      *
      * @return void
      */
-
     function show()
     {
         $user = null;
@@ -82,11 +79,17 @@ class PeopletagGroupNav extends Widget
        // FIXME: we should probably pass this in
 
         $action = $this->action->trimmed('action');
-        $nickname = $this->action->trimmed('tagger');
+
+        if (common_config('singleuser', 'enabled')) {
+            $nickname = User::singleUserNickname();
+        } else {
+            $nickname = $this->action->arg('tagger');
+        }
+
         $tag = $this->action->trimmed('tag');
 
         if ($nickname) {
-            $user = User::staticGet('nickname', $nickname);
+            $user = User::getKV('nickname', $nickname);
             $user_profile = $user->getProfile();
 
             if ($tag) {
@@ -106,24 +109,33 @@ class PeopletagGroupNav extends Widget
             // People tag timeline
             $this->out->menuItem(common_local_url('showprofiletag', array('tagger' => $user_profile->nickname,
                                                                           'tag'    => $tag->tag)),
-                             _('People tag'),
-                             sprintf(_('%s tag by %s'), $tag->tag,
+                             // TRANS: Menu item in list navigation panel.
+                             _m('MENU','List'),
+                             // TRANS: Menu item title in list navigation panel.
+                             // TRANS: %1$s is a list, %2$s is a nickname.
+                             sprintf(_('%1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'showprofiletag', 'nav_timeline_peopletag');
 
             // Tagged
             $this->out->menuItem(common_local_url('peopletagged', array('tagger' => $user->nickname,
                                                                         'tag'    => $tag->tag)),
-                             _('Tagged'),
-                             sprintf(_('%s tag by %s'), $tag->tag,
+                             // TRANS: Menu item in list navigation panel.
+                             _m('MENU','Listed'),
+                             // TRANS: Menu item title in list navigation panel.
+                             // TRANS: %1$s is a list, %2$s is a nickname.
+                             sprintf(_('%1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'peopletagged', 'nav_peopletag_tagged');
 
             // Subscribers
             $this->out->menuItem(common_local_url('peopletagsubscribers', array('tagger' => $user->nickname,
                                                                                 'tag'    => $tag->tag)),
-                             _('Subscribers'),
-                             sprintf(_('Subscribers to %s tag by %s'), $tag->tag,
+                             // TRANS: Menu item in list navigation panel.
+                             _m('MENU','Subscribers'),
+                             // TRANS: Menu item title in list navigation panel.
+                             // TRANS: %1$s is a list, %2$s is a nickname.
+                             sprintf(_('Subscribers to %1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'peopletagsubscribers', 'nav_peopletag_subscribers');
 
@@ -132,8 +144,11 @@ class PeopletagGroupNav extends Widget
                 // Edit
                 $this->out->menuItem(common_local_url('editpeopletag', array('tagger' => $user->nickname,
                                                                              'tag'    => $tag->tag)),
-                                 _('Edit'),
-                                 sprintf(_('Edit %s tag by you'), $tag->tag,
+                                 // TRANS: Menu item in list navigation panel.
+                                 _m('MENU','Edit'),
+                                 // TRANS: Menu item title in list navigation panel.
+                                 // TRANS: %s is a list.
+                                 sprintf(_('Edit %s list by you.'), $tag->tag,
                                     (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                                  $action == 'editpeopletag', 'nav_peopletag_edit');
             }