Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPXDOC-177: Internationalized sites have no images

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@327927 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl
2005-10-24 02:42:12 +00:00
parent a8a4b825ab
commit e35e0c1c79
4 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
xdoc/plugin.jelly
View File

@@ -885,12 +885,26 @@
<goal name="xdoc:copy-resources"
prereqs="xdoc:init"
description="copy static resources for use in xdocs generated html">
<util:tokenize var="allLocales" delim=", " trim="true">${maven.xdoc.locale.default}, ${maven.xdoc.locale.supported}</util:tokenize>
<j:forEach var="locale" items="${allLocales}">
<j:choose>
<j:when test="${locale == defaultLocale}">
<j:set var="_resourcesDestDir" value="${maven.docs.dest}"/>
</j:when>
<j:otherwise>
<j:set var="_resourcesDestDir" value="${maven.docs.dest}/${locale}"/>
</j:otherwise>
</j:choose>
<!-- Read in the ui properties. -->
<util:properties uri="file:${plugin.resources}/ui.properties" var="uiProperties"/>
<!-- Copy maven supplied stylesheets. -->
<copy todir="${maven.docs.dest}/style" overwrite="yes" filtering="yes">
<copy todir="${_resourcesDestDir}/style" overwrite="yes" filtering="yes">
<fileset dir="${plugin.resources}/css">
<include name="**/*.css"/>
</fileset>
@@ -917,7 +931,7 @@
</copy>
<!-- Copy maven supplied images. -->
<copy todir="${maven.docs.dest}/images">
<copy todir="${_resourcesDestDir}/images">
<fileset dir="${plugin.resources}/images">
<include name="**/*.gif"/>
<include name="**/*.jpeg"/>
@@ -939,10 +953,13 @@
<!-- excluded by default from previous -->
<j:set var="var" value="${maven.xdoc.poweredby.image}" />
<j:if test="${!empty(var)}">
<mkdir dir="${maven.docs.dest}/images/logos" />
<copy todir="${maven.docs.dest}/images/logos"
<mkdir dir="${_resourcesDestDir}/images/logos" />
<copy todir="${_resourcesDestDir}/images/logos"
file="${plugin.resources}/images/logos/${var}" />
</j:if>
</j:forEach>
</goal>
<!-- ================================================================== -->

2
xdoc/plugin.properties
View File

@@ -99,7 +99,7 @@ maven.xdoc.date.locale=${maven.xdoc.locale.default}
# The default locale (if null, it is the default locale for this instance of the Java Virtual Machine)
# By default it is en to ensure backward compatible
maven.xdoc.locale.default=EN
maven.xdoc.locale.default=en
# A comma separated of locales supported by the project
maven.xdoc.locale.supported=

1
xdoc/xdocs/changes.xml
View File

@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.10" date="in SVN">
<action dev="ltheussl" type="fix" issue="MPXDOC-177">Internationalized sites have no images.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-164">New goal <code>xdoc:sitemap</code> to generate a sitemap.</action>
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>

9
xdoc/xdocs/properties.xml
View File

@@ -169,7 +169,8 @@
<tr>
<td>maven.xdoc.date.locale</td>
<td>Yes</td>
<td>DEPRECATED. Use the property maven.xdoc.locale.default instead.<br/>Sets the locale used for the date. Defaults to ${maven.xdoc.locale.default}.
<td>DEPRECATED. Use the property maven.xdoc.locale.default instead.<br/>
Sets the locale used for the date. Defaults to ${maven.xdoc.locale.default}.
</td>
</tr>
<tr>
@@ -178,15 +179,15 @@
<td>
Sets the default locale used for the translation. If null, it is
the default locale for this instance of the Java Virtual Machine
Defaults to "en", ie english, to ensure backward compatible.
Defaults to "en", ie english, to ensure backwards compatibility.
</td>
</tr>
<tr>
<td>maven.xdoc.locale.supported</td>
<td>Yes</td>
<td>
A comma separated of locales supported by the project, ie "fr,
en_CA"
A comma separated list of locales supported by the project,
ie "fr, en_CA".
</td>
</tr>
<tr>