From 1318436ce5b1fa23cbc04692d8b676e9d7942439 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 28 Jun 2005 06:03:45 +0000
Subject: [PATCH] fix MPXDOC-147 and MPXDOC-151

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@202135 13f79535-47bb-0310-9956-ffa450edef68
---
 xdoc/src/plugin-resources/site.jsl | 16 +++++++++-------
 xdoc/xdocs/changes.xml             |  2 ++
 2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 322e2d13..23aad7f0 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -586,9 +586,8 @@
 
   <!-- Process a menu for the navigation bar -->
   <jsl:template match="menu" trim="true">
-    <j:set var="_menuName"><x:expr select="@name"/></j:set>
-    <j:set var="_menuName"><doc:escapeNameToken value="${_menuName}"/></j:set>
-
+    <j:set var="_menuName"><x:expr select="string(@name)"/></j:set>
+    <j:set var="_menuNameEscaped"><doc:escapeNameToken value="${_menuName}"/></j:set>
     <!-- Key is more important than message... -->
     <j:set var="_key">
         <x:expr select="@key" />
@@ -610,8 +609,8 @@
 
     <j:choose>
       <j:when test="${!empty(_menuName)}">
-        <div id="menu${_menuName}">
-          <h5><x:expr select="@name"/></h5>
+        <div id="menu${_menuNameEscaped}">
+          <h5>${_menuName}</h5>
           <ul><jsl:applyTemplates select="item"/></ul>
         </div>
       </j:when>
@@ -632,11 +631,14 @@
     <x:set var="_childCount" select="count(./item)"/>
     <j:set var="_isCollapsed" value="${navbean.isCollapsed(item.get(0))}"/>
     <j:set var="_state" value="none"/>
-    
+
     <!-- Key is more important than message... -->
     <j:set var="_key">
         <x:expr select="@key" />
     </j:set>
+    <j:set var="_bundle">
+        <x:expr select="@bundle" />
+    </j:set>    
     <j:if test="${!empty(_key)}">
         <!-- Default bundle is the user one in ${maven.xdoc.bundle} -->
         <j:if test="${empty(_bundle)}">
@@ -648,7 +650,7 @@
             </fmt:bundle>
         </j:if>
     </j:if>
-    
+
     <j:if test="${_childCount.intValue() gt 0}">
       <j:if test="${!_isCollapsed}"><j:set var="_state" value="expanded"/></j:if>
       <j:if test="${_isCollapsed}"><j:set var="_state" value="collapsed"/></j:if>
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index c8c0ffae..1c0f7ff4 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -26,6 +26,8 @@
   </properties>
   <body>
     <release version="1.9.2-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="fix" issue="MPXDOC-151">i18n : menu tag in xdoc does not work with "key" translated text id.</action>
+      <action dev="aheritier" type="fix" issue="MPXDOC-147">Missing "Project Reports" header in the generated menu.</action>
       <action dev="vsiveton" type="fix" issue="MPXDOC-148" due-to="Incze Lajos">Fixed bundles expression.</action>
     </release>
     <release version="1.9.1" date="2005-06-16">
