From be8ff1a08a34c731c676218fad7e3b77aafabfc3 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Sun, 14 Feb 2010 19:33:25 +0100
Subject: [PATCH] MFB: Don't use WikiWords in menus (Request #7021).

---
 wicked/config/conf.xml                |  8 ++++----
 wicked/docs/CHANGES                   |  1 +
 wicked/lib/Wicked.php                 | 16 +++++++---------
 wicked/templates/display/standard.inc | 14 +++++++-------
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/wicked/config/conf.xml b/wicked/config/conf.xml
index fe4e52d0a..f9747cd79 100644
--- a/wicked/config/conf.xml
+++ b/wicked/config/conf.xml
@@ -60,10 +60,10 @@
   <configmultienum name="pages" desc="What standard pages would you like to
   show up as links in Wicked's menu?">WikiHome
    <values>
-    <value desc="WikiHome">_WikiHome</value>
-    <value desc="HowToUseWiki">HowTo_UseWiki</value>
-    <value desc="RecentChanges">_RecentChanges</value>
-    <value desc="AllPages">_AllPages</value>
+    <value desc="Home">WikiHome</value>
+    <value desc="Usage">HowToUseWiki</value>
+    <value desc="Recent Changes">RecentChanges</value>
+    <value desc="All Pages">AllPages</value>
    </values>
   </configmultienum>
 
diff --git a/wicked/docs/CHANGES b/wicked/docs/CHANGES
index 6e3d51e2b..3583abd1b 100644
--- a/wicked/docs/CHANGES
+++ b/wicked/docs/CHANGES
@@ -2,6 +2,7 @@
 v1.0-cvs
 --------
 
+[jan] Don't use WikiWords in menus (Request #7021).
 [jan] Drop support for coWiki markup.
 [jan] Fix Oracle SQL scripts.
 [jan] Implement pessimistic locking based on Horde_Lock.
diff --git a/wicked/lib/Wicked.php b/wicked/lib/Wicked.php
index 0c2d40f65..1cf0114d6 100644
--- a/wicked/lib/Wicked.php
+++ b/wicked/lib/Wicked.php
@@ -96,10 +96,11 @@ class Wicked {
         $menu = new Horde_Menu(Horde_Menu::MASK_ALL);
 
         if (@count($conf['menu']['pages'])) {
+            $pages = array('WikiHome' => _("_Home"),
+                           'HowToUseWiki' => _("_Usage"),
+                           'RecentChanges' => _("_Recent Changes"),
+                           'AllPages' => _("_All Pages"));
             foreach ($conf['menu']['pages'] as $pagename) {
-                /* Remove access keys. */
-                $rawname = Horde::stripAccessKey($pagename);
-
                 /* Determine who we should say referred us. */
                 $curpage = isset($page) ? $page->pageName() : null;
                 $referrer = Horde_Util::getFormData('referrer', $curpage);
@@ -108,14 +109,14 @@ class Wicked {
                  * this on our own because all the buttons go to the same .php
                  * file, just with different args. */
                 if (!strstr($_SERVER['PHP_SELF'], 'prefs.php') &&
-                    $curpage === _($rawname)) {
+                    $curpage === $rawname) {
                     $cellclass = 'current';
                 } else {
                     $cellclass = '__noselection';
                 }
 
-                $url = Horde_Util::addParameter(Wicked::url($rawname), 'referrer', $referrer);
-                $menu->add($url, _($pagename), $rawname . '.png', null, null, null, $cellclass);
+                $url = Horde_Util::addParameter(Wicked::url($pagename), 'referrer', $referrer);
+                $menu->add($url, $pages[$pagename], $pagename . '.png', null, null, null, $cellclass);
             }
         }
 
@@ -124,9 +125,6 @@ class Wicked {
         } else {
             return $menu->render();
         }
-
-        /* Placeholders to have translateable page names with access keys. */
-        array(_("_WikiHome"), _("HowTo_UseWiki"), _("_RecentChanges"), _("_AllPages"));
     }
 
     /**
diff --git a/wicked/templates/display/standard.inc b/wicked/templates/display/standard.inc
index 08b086045..6916c1967 100644
--- a/wicked/templates/display/standard.inc
+++ b/wicked/templates/display/standard.inc
@@ -22,7 +22,7 @@ if ($this->allows(WICKED_MODE_EDIT) && !$this->isLocked(Wicked::lockUser())) {
     $url = Horde_Util::addParameter(Wicked::url('EditPage'),
                               'referrer', $this->pageName());
     echo Horde::widget($url, sprintf(_("Edit %s"), $this->pageName()),
-                       'widget', '', '', _("_EditPage"));
+                       'widget', '', '', _("_Edit"));
 }
 
 if ($this->isLocked()) {
@@ -60,25 +60,25 @@ if ($this->allows(WICKED_MODE_EDIT) && !$this->isLocked(Wicked::lockUser())) {
     separator();
     $url = Horde_Util::addParameter(Wicked::url('MergeOrRename'),
                               'referrer', $this->pageName());
-    echo Horde::widget($url, _("MergeOrRename"), 'widget', '', '',
-                       _("_MergeOrRename"));
+    echo Horde::widget($url, _("Merge/Rename"), 'widget', '', '',
+                       _("_Merge/Rename"));
 }
 
 separator();
 $url = Horde_Util::addParameter(Wicked::url('BackLinks'),
                           'referrer', $this->pageName());
-echo Horde::widget($url, _("BackLinks"), 'widget', '', '', _("_BackLinks"));
+echo Horde::widget($url, _("Backlinks"), 'widget', '', '', _("_Backlinks"));
 
 separator();
 $url = Horde_Util::addParameter(Wicked::url('LikePages'),
                           'referrer', $this->pageName());
-echo Horde::widget($url, _("LikePages"), 'widget', '', '', _("L_ikePages"));
+echo Horde::widget($url, _("Similar Pages"), 'widget', '', '', _("S_imilar Pages"));
 
 separator();
 $url = Horde_Util::addParameter(Wicked::url('AttachedFiles'),
                           'referrer', $this->pageName());
-echo Horde::widget($url, _("AttachedFiles"), 'widget', '', '',
-                   _("Attached_Files"));
+echo Horde::widget($url, _("Attachments"), 'widget', '', '',
+                   _("Attachments"));
 
 if ($this->allows(WICKED_MODE_HISTORY)) {
     separator();
-- 
2.11.0