Author: ltheussl
Date: Mon May 1 15:41:34 2006
New Revision: 398719
URL: http://svn.apache.org/viewcvs?rev=398719&view=rev
Log:
PR: MPXDOC-194
Add i18n support for links and breadcrumbs.
Added:
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_de.properties
(with props)
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/navigation.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs.properties
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_fr.properties
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl?rev=398719&r1=398718&r2=398719&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl Mon May 1
15:41:34 2006
@@ -672,6 +672,24 @@
<x:forEach var="link" select="item">
<x:set var="_img" select="string(@img)"/>
<x:set var="_name" select="string(@name)"/>
+ <!-- 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)}">
+ <fmt:message key="${_key}" bundle="${myMsg}" var="_name"/>
+ </j:if>
+ <j:if test="${!empty(_bundle)}">
+ <fmt:bundle basename="${_bundle}">
+ <fmt:message key="${_key}" var="_name"/>
+ </fmt:bundle>
+ </j:if>
+ </j:if>
<x:set var="_link" select="string(@href)"/>
<x:set var="_target" select="string(@target)"/>
<x:set var="_hideName" select="string(@hideName)"/>
@@ -692,6 +710,24 @@
<x:forEach var="link" select="item">
<x:set var="_img" select="string(@img)"/>
<x:set var="_name" select="string(@name)"/>
+ <!-- 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)}">
+ <fmt:message key="${_key}" bundle="${myMsg}" var="_name"/>
+ </j:if>
+ <j:if test="${!empty(_bundle)}">
+ <fmt:bundle basename="${_bundle}">
+ <fmt:message key="${_key}" var="_name"/>
+ </fmt:bundle>
+ </j:if>
+ </j:if>
<x:set var="_link" select="string(@href)"/>
<x:set var="_target" select="string(@target)"/>
<x:set var="_hideName" select="string(@hideName)"/>
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/navigation.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/navigation.xml?rev=398719&r1=398718&r2=398719&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/navigation.xml
(original)
+++
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/navigation.xml
Mon May 1 15:41:34 2006
@@ -25,10 +25,8 @@
<body>
<links>
-<!--
- <item name="PDF Documentation" href="app.pdf"
- img="images/pdf.gif"/>
--->
+ <item key="navigation.links.item1"
+ href="/sitemap.html" />
</links>
<sitemap/>
<!-- project overview -->
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs.properties?rev=398719&r1=398718&r2=398719&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs.properties
(original)
+++
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs.properties
Mon May 1 15:41:34 2006
@@ -1,5 +1,6 @@
# From navigation.xml
navigation.title=MPXDOC-128
+navigation.links.item1=Sitemap
navigation.menu1.title=General Project Information
navigation.menu1.item1=myfile_i18n
navigation.menu1.item2=testjsltosite
Added:
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_de.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_de.properties?rev=398719&view=auto
==============================================================================
---
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_de.properties
(added)
+++
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_de.properties
Mon May 1 15:41:34 2006
@@ -0,0 +1,22 @@
+# From navigation.xml
+navigation.title=MPXDOC-128
+navigation.links.item1=Seitenübersicht
+navigation.menu1.title=Allgemeine Projektinformation
+navigation.menu1.item1=myfile_i18n
+navigation.menu1.item2=testjsltosite
+navigation.menu1.item3=testjsltosite2
+
+# From myfile_i18n.xml
+myfile_i18n.title=Xdoc Test Dokument
+myfile_i18n.section1.title=Titel 1
+myfile_i18n.section1.description1=leeres Dokument
+myfile_i18n.section1.description2=Dieses Dokument wird unabhängig von anderen
Seiten erzeugt, es sollte jedoch dasselbe Stylesheet und Navigationsmenu
verwenden.
+
+# From testjstltosite.xml
+testjstltosite.title=test jslToSite tag
+testjstltosite.section1.title=Titel 1
+testjstltosite.section1.description1=leeres Dokument
+testjstltosite.section1.description2=Dieses Dokument wird unabhängig von
anderen Seiten erzeugt, es sollte jedoch dasselbe Stylesheet und
Navigationsmenu verwenden.
+
+testlinks.mysite1=http://mysite1.de
+testlinks.mysite2=http://mysite2.de
Propchange:
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_de.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_de.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_fr.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_fr.properties?rev=398719&r1=398718&r2=398719&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_fr.properties
(original)
+++
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/xdocs/xdocs_fr.properties
Mon May 1 15:41:34 2006
@@ -1,5 +1,6 @@
# From navigation.xml
navigation.title=MPXDOC-128
+navigation.links.item1=Plan du site
navigation.menu1.title=Information générale sur le projet
navigation.menu1.item1=myfile_i18n
navigation.menu1.item2=testjsltosite
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?rev=398719&r1=398718&r2=398719&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Mon May 1 15:41:34 2006
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.10-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="fix" issue="MPXDOC-194">Add i18n support
for links and breadcrumbs.</action>
<action dev="aheritier" type="update" issue="MAVEN-1753">Replace the
deprecated xmlParserAPIs by xml-apis 1.3.03.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-192">Add a public DTD
identifier for xdoc.</action>
<action dev="aheritier" type="update">An image can be used in the menu
entry for a report.</action>
