[dev] [horde-patch] consistency in "Logout" labels

[Francois Marier]

On Sun, Aug 01, 2004 at 01:15:36AM -0400, Chuck Hagenbuch wrote:
> Quoting Francois Marier <francois at nit.ca>:
> 
> >All logout buttons are written "Logout" except for the Horde portal
> >logout button which is "Log out".
> >
> >So this trivial patch removes the space to improve consistency.
> 
> I'd actually rather consistently make it "Log out" and "Log in". 
> Slightly better
> english.

Alright, here are a few patches to make all labels "Log out".

Francois
-------------- next part --------------
diff -rpuN -X ../ignorelist ../build/framework/Menu/Menu.php framework/Menu/Menu.php
--- ../build/framework/Menu/Menu.php	Tue Jun 29 09:10:00 2004
+++ framework/Menu/Menu.php	Mon Aug  2 13:33:50 2004
@@ -284,10 +284,10 @@ class Menu {
         if (Auth::getAuth() && $this->_with_login) {
             $url = Horde::url($registry->getParam('webroot', 'horde') . '/login.php');
             $url = Auth::addLogoutParameters($url, AUTH_REASON_LOGOUT);
-            $menu[] = array('url' => $url, 'text' => _("Logout"), 'icon' => 'logout.gif', 'icon_path' => $graphics);
+            $menu[] = array('url' => $url, 'text' => _("Log out"), 'icon' => 'logout.gif', 'icon_path' => $graphics);
         } elseif ($this->_with_login) {
             $url = Auth::getLoginScreen('', Horde::selfUrl());
-            $menu[] = array('url' => $url, 'text' => _("Login"), 'icon' => 'login.gif', 'icon_path' => $graphics);
+            $menu[] = array('url' => $url, 'text' => _("Log in"), 'icon' => 'login.gif', 'icon_path' => $graphics);
         }
 
         /* Loop through the menu and set up necessary elements. */
-------------- next part --------------
diff -rpuN -X ../ignorelist ../build/horde/config/registry.php.dist horde/config/registry.php.dist
--- ../build/horde/config/registry.php.dist	Fri Jul  9 22:11:43 2004
+++ horde/config/registry.php.dist	Mon Aug  2 13:28:52 2004
@@ -66,7 +66,7 @@ if (Auth::getAuth()) {
         'webroot' => $this->applications['horde']['webroot'],
         'initial_page' => 'login.php?' . AUTH_REASON_PARAM . '=' . AUTH_REASON_LOGOUT,
         'icon' => $this->applications['horde']['webroot'] . '/graphics/logout.gif',
-        'name' => _("Logout"),
+        'name' => _("Log out"),
         'status' => 'notoolbar'
         );
 } else {
@@ -75,7 +75,7 @@ if (Auth::getAuth()) {
         'webroot' => $this->applications['horde']['webroot'],
         'initial_page' => 'login.php?url=' . urlencode(Horde::selfUrl(true)),
         'icon' => $this->applications['horde']['webroot'] . '/graphics/login.gif',
-        'name' => _("Login"),
+        'name' => _("Log in"),
         'status' => 'notoolbar'
         );
 }
diff -rpuN -X ../ignorelist ../build/horde/services/portal/menu.php horde/services/portal/menu.php
--- ../build/horde/services/portal/menu.php	Fri Jun 25 09:54:00 2004
+++ horde/services/portal/menu.php	Mon Aug  2 13:38:08 2004
@@ -208,15 +208,15 @@ if (Auth::isAuthenticated()) {
     $menutext .= '<table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" width="28" height="20">' . $link . Horde::img($icon, $label) . '</a></td><td>' . $link . $label . '</a></td></tr></table>';
 
     /* Add a logout link. */
-    $link = Horde::link(Auth::addLogoutParameters(Horde::applicationUrl('login.php'), AUTH_REASON_LOGOUT), _("Logout"), 'menuitem sidebaritem', $conf['menu']['always'] ? $target : '_parent',
+    $link = Horde::link(Auth::addLogoutParameters(Horde::applicationUrl('login.php'), AUTH_REASON_LOGOUT), _("Log out"), 'menuitem sidebaritem', $conf['menu']['always'] ? $target : '_parent',
                         null, sprintf(_("Log out of %s"), $registry->getParam('name')));
-    $label = _("Logout");
+    $label = _("Log out");
     $icon = 'logout.gif';
 } else {
     /* Add a login link. */
-    $link = Horde::link(Horde::applicationUrl('login.php'), _("Login"), 'menuitem sidebaritem', $target,
+    $link = Horde::link(Horde::applicationUrl('login.php'), _("Log in"), 'menuitem sidebaritem', $target,
                         null, sprintf(_("Log in to %s"), $registry->getParam('name')));
-    $label = _("Login");
+    $label = _("Log in");
     $icon = 'login.gif';
 }
 $menutext .= '<table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" width="28" height="20">' . $link . Horde::img($icon, $label) . '</a></td><td>' . $link . $label . '</a></td></tr></table>';
-------------- next part --------------
diff -rpuN -X ../ignorelist ../build/imp/templates/menu/menu.inc imp/templates/menu/menu.inc
--- ../build/imp/templates/menu/menu.inc	Tue Jul 13 14:10:39 2004
+++ imp/templates/menu/menu.inc	Mon Aug  2 13:15:17 2004
@@ -58,10 +58,10 @@ Menu::appLinks();
 if (!IMP::canAutoLogin()) {
     if ((Auth::getProvider() == 'imp') && $prefs->getValue('show_sidebar')) {
         $menu_logout_url = $registry->getParam('webroot', 'horde') . '/login.php';
-        echo Menu::createItem(Auth::addLogoutParameters($menu_logout_url, AUTH_REASON_LOGOUT), _("_Logout"), 'logout.gif', $registry->getParam('graphics', 'horde'), $conf['menu']['always'] ? 'horde_main' : '_parent');
+        echo Menu::createItem(Auth::addLogoutParameters($menu_logout_url, AUTH_REASON_LOGOUT), _("_Log out"), 'logout.gif', $registry->getParam('graphics', 'horde'), $conf['menu']['always'] ? 'horde_main' : '_parent');
     } else {
         $menu_logout_url = Horde::applicationUrl('login.php');
-        echo Menu::createItem(Auth::addLogoutParameters($menu_logout_url, AUTH_REASON_LOGOUT), _("_Logout"), 'logout.gif', $registry->getParam('graphics', 'horde'));
+        echo Menu::createItem(Auth::addLogoutParameters($menu_logout_url, AUTH_REASON_LOGOUT), _("_Log out"), 'logout.gif', $registry->getParam('graphics', 'horde'));
     }
 }