Author: andreas
Date: Mon Feb 11 14:50:57 2008
New Revision: 620656
URL: http://svn.apache.org/viewvc?rev=620656&view=rev
Log:
Fixed inclusion of core and publication i18n catalogues.
Modified:
lenya/trunk/src/modules-core/i18n/sitemap.xmap
lenya/trunk/src/modules-core/i18n/xslt/modules2include.xsl
Modified: lenya/trunk/src/modules-core/i18n/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/i18n/sitemap.xmap?rev=620656&r1=620655&r2=620656&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/i18n/sitemap.xmap (original)
+++ lenya/trunk/src/modules-core/i18n/sitemap.xmap Mon Feb 11 14:50:57 2008
@@ -62,13 +62,13 @@
<map:serialize type="xml"/>
</map:match>
- <!-- Generate publication and module i18n catalogues. We use the selector instead of direct inclusion
+ <!-- Generate module i18n catalogues. We use the selector instead of direct inclusion
because otherwise the result wouldn't be cached when catalogues are missing. -->
- <!-- {1:type(publications|modules)}/{2:module}/{3:catalogue} -->
- <map:match pattern="*/*/*">
+ <!-- modules/{1:module}/{2:catalogue} -->
+ <map:match pattern="modules/*/*">
<map:select type="resource-exists">
- <map:when test="aggregate-fallback://lenya/{1}/{2}/resources/i18n/{3}">
- <map:generate src="aggregate-fallback://lenya/{1}/{2}/resources/i18n/{3}"/>
+ <map:when test="aggregate-fallback://lenya/modules/{1}/resources/i18n/{2}">
+ <map:generate src="aggregate-fallback://lenya/modules/{1}/resources/i18n/{2}"/>
<map:serialize type="xml"/>
</map:when>
<map:otherwise>
Modified: lenya/trunk/src/modules-core/i18n/xslt/modules2include.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/i18n/xslt/modules2include.xsl?rev=620656&r1=620655&r2=620656&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/i18n/xslt/modules2include.xsl (original)
+++ lenya/trunk/src/modules-core/i18n/xslt/modules2include.xsl Mon Feb 11 14:50:57 2008
@@ -30,9 +30,8 @@
<xsl:template match="lenya:publication">
<i18n:catalogue>
- <i:include src="cocoon:/pubs/{$pub}/{$catalogue}" strip-root="true"/>
+ <i:include src="aggregate-fallback://lenya/resources/i18n/{$catalogue}" strip-root="true"/>
<xsl:apply-templates select="lenya:modules/lenya:module"/>
- <i:include src="fallback://lenya/resources/i18n/{$catalogue}" strip-root="true"/>
</i18n:catalogue>
</xsl:template>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.