You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/10/02 19:27:00 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/xslt/navigation sitetree2nav.xsl
andreas 2003/10/02 10:27:00
Modified: src/webapp/lenya/xslt/navigation sitetree2nav.xsl
Log:
adding existing language to navigation tree if requested language does not exist
Revision Changes Path
1.14 +23 -4 cocoon-lenya/src/webapp/lenya/xslt/navigation/sitetree2nav.xsl
Index: sitetree2nav.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/navigation/sitetree2nav.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sitetree2nav.xsl 19 Sep 2003 11:46:16 -0000 1.13
+++ sitetree2nav.xsl 2 Oct 2003 17:27:00 -0000 1.14
@@ -39,7 +39,22 @@
<xsl:apply-templates/>
</nav:site>
-</xsl:template>
+</xsl:template>
+
+
+<!--
+Resolves the existing language of a node, preferrably
+the default language.
+-->
+<xsl:template name="resolve-existing-language">
+ <xsl:choose>
+ <xsl:when test="tree:label[lang($chosenlanguage)]"><xsl:value-of select="$chosenlanguage"/></xsl:when>
+ <xsl:when test="tree:label[lang($defaultlanguage)]"><xsl:value-of select="$defaultlanguage"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="tree:label/@xml:lang"/></xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+
<!--
Apply nodes recursively
@@ -49,6 +64,10 @@
<!-- basic url of parent node -->
<xsl:param name="previous-url" select="''"/>
+ <xsl:variable name="existinglanguage">
+ <xsl:call-template name="resolve-existing-language"/>
+ </xsl:variable>
+
<nav:node>
<xsl:copy-of select="@id"/>
@@ -68,12 +87,12 @@
</xsl:variable>
<xsl:variable name="language-suffix">
- <xsl:text>_<xsl:value-of select="$chosenlanguage"/></xsl:text>
+ <xsl:text>_</xsl:text><xsl:value-of select="$existinglanguage"/>
</xsl:variable>
<xsl:variable name="canonical-language-suffix">
<xsl:choose>
- <xsl:when test="not($defaultlanguage = $chosenlanguage)">
+ <xsl:when test="not($defaultlanguage = $existinglanguage)">
<xsl:value-of select="$language-suffix"/>
</xsl:when>
<xsl:otherwise>
@@ -89,7 +108,7 @@
<xsl:text>.</xsl:text>
<xsl:choose>
<xsl:when test="@suffix">
- <xsl:text><xsl:value-of select="@suffix"/></xsl:text>
+ <xsl:value-of select="@suffix"/>
</xsl:when>
<xsl:otherwise>
<xsl:text>html</xsl:text>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org