[GeoNetwork-commit] SF.net SVN: geonetwork:[1548] trunk

[<fxp...@us...>]

Revision: 1548
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1548&view=rev
Author:   fxprunayre
Date:     2008-10-05 08:23:05 +0000 (Sun, 05 Oct 2008)

Log Message:
-----------
Added build french documentation and adapt banner link to doc according to GUI language.

Modified Paths:
--------------
    trunk/docs/build-docbook.xml
    trunk/docs/build.xml
    trunk/docs/changes.txt
    trunk/web/geonetwork/xsl/banner.xsl

Modified: trunk/docs/build-docbook.xml
===================================================================
--- trunk/docs/build-docbook.xml	2008-10-05 08:11:17 UTC (rev 1547)
+++ trunk/docs/build-docbook.xml	2008-10-05 08:23:05 UTC (rev 1548)
@@ -131,9 +131,11 @@
     <attribute name="dir"/>
     <attribute name="file"/>
     <attribute name="xsl"/>
+    <attribute name="lang"/>
     <sequential>
 
-    <property name="@{type}.target.dir" value="${target.dir}/@{dir}/@{target}"/>
+    <property name="@{type}.target.dir" value="${target.dir}/@{dir}/@{target}/@{lang}"/>
+    <property name="@{type}.target.dir.image" value="${target.dir}/@{dir}/@{target}"/>    	
     <property name="@{type}.target.file" value="${@{type}.target.dir}/@{file}"/>
     <property name="@{type}.tmp.style" value="${tmp.dir}/@{type}.xsl"/>
     <property name="@{type}.tmp.custom" value="${tmp.dir}/@{type}-style.xsl"/>
@@ -169,7 +171,7 @@
            output="${@{type}.tmp.titlepage}.xsl"
            style="${dbf.xsl.dir}/template/titlepage.xsl"/>
 
-    <copy todir="${@{type}.target.dir}/images">
+    <copy todir="${@{type}.target.dir.image}/images">
       <fileset dir="${docbook.src.dir}/@{dir}/images"/>
     </copy>
 
@@ -266,6 +268,7 @@
     <delete quiet="true" dir="${target.dir}"/>
     <delete quiet="true" dir="${basedir}/html"/>
     <delete quiet="true" file="${basedir}/Manual.pdf"/>
+    <delete quiet="true" file="${basedir}/Manual_fra.pdf"/>
     <delete quiet="true" file="${basedir}/docbook_guidelines.pdf"/>
   </target>
 
@@ -278,7 +281,7 @@
           depends="prepare"
           description="--> Generate PDF docs">
 
-    <transform type="pdf" target="tmp" title="pdf" xsl="fo" dir="${docbook.dir}" file="${docbook.file}"/>
+    <transform type="pdf" target="tmp" title="pdf" xsl="fo" dir="${docbook.dir}" file="${docbook.file}" lang="${lang}"/>
 
     <fop format="application/pdf" 
         fofile="${pdf.target.file}.xml"
@@ -296,7 +299,7 @@
           depends="prepare"
           description="--> Generate HTML docs in multiple files">
 
-    <transform type="html" target="html" title="html" xsl="html" dir="${docbook.dir}" file="${docbook.file}"/>
+    <transform type="html" target="html" title="html" xsl="html" dir="${docbook.dir}" file="${docbook.file}" lang="${lang}"/>
 
     <copy todir="${html.target.dir}/images">
       <fileset dir="${dbf.xsl.dir}/images/"/>
@@ -311,7 +314,7 @@
     <copy todir="${basedir}/html">
       <fileset dir="${target.dir}/${docbook.dir}/html"/>
     </copy>
-    
+
   </target>
 
   <!-- ======================================================================== -->

Modified: trunk/docs/build.xml
===================================================================
--- trunk/docs/build.xml	2008-10-05 08:11:17 UTC (rev 1547)
+++ trunk/docs/build.xml	2008-10-05 08:23:05 UTC (rev 1548)
@@ -35,7 +35,14 @@
     <ant antfile="${dbf.basedir}/build-docbook.xml" target="all">
       <property name="docbook.dir" value="gn_manual"/>
       <property name="docbook.file" value="Manual"/>
+      <property name="lang" value="eng"/>
     </ant>
+  	
+    <ant antfile="${dbf.basedir}/build-docbook.xml" target="all">
+      <property name="docbook.dir" value="gn_manual_fra"/>
+      <property name="docbook.file" value="Manual_fra"/>
+	  <property name="lang" value="fra"/>
+    </ant>
   </target>
 
   <!-- ======================================================================== -->
@@ -49,7 +56,14 @@
     <ant antfile="${dbf.basedir}/build-docbook.xml" target="pdf">
       <property name="docbook.dir" value="gn_manual"/>
       <property name="docbook.file" value="Manual"/>
+      <property name="lang" value="eng"/>
     </ant>
+  
+    <ant antfile="${dbf.basedir}/build-docbook.xml" target="pdf">
+      <property name="docbook.dir" value="gn_manual_fra"/>
+      <property name="docbook.file" value="Manual_fra"/>
+      <property name="lang" value="fra"/>
+    </ant>
   </target>
 
   <!-- ======================================================================== -->
@@ -63,7 +77,14 @@
     <ant antfile="${dbf.basedir}/build-docbook.xml" target="html">
       <property name="docbook.dir" value="gn_manual"/>
       <property name="docbook.file" value="Manual"/>
+      <property name="lang" value="eng"/>
     </ant>
+
+    <ant antfile="${dbf.basedir}/build-docbook.xml" target="html">
+      <property name="docbook.dir" value="gn_manual_fra"/>
+      <property name="docbook.file" value="Manual_fra"/>
+      <property name="lang" value="fra"/>
+    </ant>
   </target>
 
   <!-- ======================================================================== -->
@@ -80,8 +101,9 @@
     <ant antfile="${dbf.basedir}/build-docbook.xml" target="pdf">
       <property name="docbook.dir" value="guidelines"/>
       <property name="docbook.file" value="docbook_guidelines"/>
-      </ant>
-   </target>
+      <property name="lang" value="eng"/>
+    </ant>
+  </target>
    
   <!-- ======================================================================== -->
   <!-- ==                                                                    == -->

Modified: trunk/docs/changes.txt
===================================================================
--- trunk/docs/changes.txt	2008-10-05 08:11:17 UTC (rev 1547)
+++ trunk/docs/changes.txt	2008-10-05 08:23:05 UTC (rev 1548)
@@ -20,10 +20,14 @@
 --- Changes
 --------------------------------------------------------------------------------
 
+- Added multilingual support in installer
+
+- Added french translation of the documentation
+
 - Added support for printing search result in PDF format 
 (http://trac.osgeo.org/geonetwork/wiki/PrintPdf)
 
-- Added support to harvest the OGC:GetCapabilities documents
+- Added support to harvest the OGC:GetCapabilities (WMS, WFS, WCS and WPS) documents
 to produce metadata for services and layers/featuretypes/coverages
 in ISO19139/119 format (http://trac.osgeo.org/geonetwork/wiki/ISO19119impl)
 

Modified: trunk/web/geonetwork/xsl/banner.xsl
===================================================================
--- trunk/web/geonetwork/xsl/banner.xsl	2008-10-05 08:11:17 UTC (rev 1547)
+++ trunk/web/geonetwork/xsl/banner.xsl	2008-10-05 08:23:05 UTC (rev 1548)
@@ -80,9 +80,17 @@
 							<a class="banner" href="{/root/gui/locService}/help"><xsl:value-of select="/root/gui/strings/help"/></a>
 						</xsl:otherwise>
 					</xsl:choose> -->
-
-					<a class="banner" href="{/root/gui/url}/docs/index.html" target="_blank"><xsl:value-of select="/root/gui/strings/help"/></a>
 					
+					<!-- Help section to be displayed according to GUI language -->
+					<xsl:choose>
+						<xsl:when test="/root/gui/language='fr'">
+							<a class="banner" href="{/root/gui/url}/docs/fra/" target="_blank"><xsl:value-of select="/root/gui/strings/help"/></a>
+						</xsl:when>
+						<xsl:otherwise>
+							<a class="banner" href="{/root/gui/url}/docs/eng/" target="_blank"><xsl:value-of select="/root/gui/strings/help"/></a>
+						</xsl:otherwise>
+					</xsl:choose>
+					<span class="banner">|</span>
 				</td>
 				<td align="right" class="banner-menu">
 					<xsl:choose>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.