Jörn Nettingsmeier wrote:
[EMAIL PROTECTED] wrote:
Author: andreas
Date: Tue Aug 22 08:40:09 2006
New Revision: 433675
URL: http://svn.apache.org/viewvc?rev=433675&view=rev
Log:
Fixed fallback URLs for i18n
this fix breaks the i18n again for templated publications.
i have commented on the change in the bugzilla entry.
the current symptom is thus:
if you have no catalogue.xsp in your template publication, lenya i18n
will work but publication i18n will not work. if you copy
src/webapp/lenya/resources/i18n/catalogue.xsp into the template
publication, publication i18n will work but lenya gui i18n won't.
the only way to fix this for all cases is the original patch as i posted
it. i can't say for sure why this is the case, but please revert this
change.
Without the change, i18n was completely broken for me
("untranslated" messages everywhere ...).
Maybe someone else would like to give it a try?
-- Andreas
regards,
jörn
Modified:
lenya/trunk/src/webapp/lenya/i18n.xmap
Modified: lenya/trunk/src/webapp/lenya/i18n.xmap
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/i18n.xmap?rev=433675&r1=433674&r2=433675&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/i18n.xmap (original)
+++ lenya/trunk/src/webapp/lenya/i18n.xmap Tue Aug 22 08:40:09 2006
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
-
+ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+ + http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
@@ -24,16 +24,16 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-
- <map:pipelines>
+ <map:pipelines>
+ <map:pipeline type="noncaching">
<map:match pattern="i18n-catalogue/**">
<map:select type="resource-exists">
- <map:when test="fallback://resources/i18n/{1}">
- <map:generate type="serverpages"
src="fallback://resources/i18n/catalogue.xsp">
- <map:parameter name="pub-catalogue-location"
value="fallback://resources/i18n/"/>
- <map:parameter name="catalogue-file" value="{1}"/>
+ <map:when test="fallback://lenya/resources/i18n/{1}">
+ <map:generate type="serverpages"
src="fallback://lenya/resources/i18n/catalogue.xsp">
+ <map:parameter name="pub-catalogue-location"
value="fallback://lenya/resources/i18n/"/>
+ <map:parameter name="catalogue-file" value="{1}"/>
</map:generate>
<map:transform type="xinclude"/>
<map:serialize/>
@@ -46,5 +46,5 @@
</map:match>
</map:pipeline> </map:pipelines>
-
+ </map:sitemap>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
