Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 0fd0f45c7d623a035a93a7a58a55829a5a826d02..5d1b52f795d2030088fd151d5553bb860caa72af 100644 (file)
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -44,29 +44,13 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @see      Widget
  */
-
-class LoginGroupNav extends Widget
+class LoginGroupNav extends Menu
 {
-    var $action = null;
-
-    /**
-     * Construction
-     *
-     * @param Action $action current action, used for output
-     */
-
-    function __construct($action=null)
-    {
-        parent::__construct($action);
-        $this->action = $action;
-    }
-
     /**
      * Show the menu
      *
      * @return void
      */
-
     function show()
     {
         $action_name = $this->action->trimmed('action');
@@ -76,13 +60,18 @@ class LoginGroupNav extends Widget
         if (Event::handle('StartLoginGroupNav', array($this->action))) {
 
             $this->action->menuItem(common_local_url('login'),
-                                    _('Login'),
+                                    // TRANS: Menu item for logging in to the StatusNet site.
+                                    _m('MENU','Login'),
+                                    // TRANS: Title for menu item for logging in to the StatusNet site.
                                     _('Login with a username and password'),
                                     $action_name === 'login');
 
-            if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
+            if (!common_logged_in() &&
+                !(common_config('site','closed') || common_config('site','inviteonly'))) {
                 $this->action->menuItem(common_local_url('register'),
-                                        _('Register'),
+                                        // TRANS: Menu item for registering with the StatusNet site.
+                                        _m('MENU','Register'),
+                                        // TRANS: Title for menu item for registering with the StatusNet site.
                                         _('Sign up for a new account'),
                                         $action_name === 'register');
             }