svn commit: r619698 - in /lenya/trunk/src/webapp/lenya: config/sitemap/ resources/i18n/

[email protected]
Newsgroups gmane.comp.cms.lenya.cvs
Message-ID <[email protected]> 
Author: andreas
Date: Thu Feb  7 16:20:32 2008
New Revision: 619698

URL: http://svn.apache.org/viewvc?rev=619698&view=rev
Log:
Removing old i18n handling code from core.

Added:
    lenya/trunk/src/webapp/lenya/resources/i18n/modules2include.xsl
      - copied, changed from r618794, lenya/trunk/src/webapp/lenya/resources/i18n/modules2xinclude.xsl
Removed:
    lenya/trunk/src/webapp/lenya/resources/i18n/modules2xinclude.xsl
Modified:
    lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap
    lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml

Modified: lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap?rev=619698&r1=619697&r2=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap Thu Feb  7 16:20:32 2008
@@ -25,41 +25,36 @@
 <!-- =========================== Pipelines ================================= -->
 
   <map:pipelines>
-
-    <!-- I18N  -->
-    <map:pipeline>
-      <map:match pattern="i18n-catalogue/**">
-        <map:mount uri-prefix="" src="lenya/i18n.xmap" check-reload="true" reload-method="synchron"/>
-      </map:match>
-    </map:pipeline>
-
-    <map:pipeline>
-    
-    <!-- Lenya GUI screen -->
-      <map:match pattern="lenya-screen.xsl">
-        <map:generate src="fallback://lenya/xslt/util/page2xhtml.xsl"/>
-        <map:serialize type="xml"/>
-      </map:match>
-      
-      <map:match pattern="ac.login" type="usecase">
-        <map:mount src="fallback://lenya/modules/usecase/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
-      </map:match>
-      <map:match pattern="ac.logout" type="usecase">
-        <map:mount src="fallback://lenya/modules/usecase/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
-      </map:match>
-
-    <!-- favicon -->
-    <map:match pattern="favicon.ico">
-      <map:read mime-type="image/x-icon" src="lenya/resources/images/lenya.ico"/>
-    </map:match>
-    </map:pipeline>
-
-    <map:pipeline internal-only="true">
-      <map:match pattern="**">
-        <map:mount uri-prefix="" src="global-sitemap.xmap" check-reload="true" reload-method="synchron"/>
-      </map:match>
-    </map:pipeline>
-      
+
+    <map:pipeline internal-only="true">
+      
+      <!-- Lenya GUI screen -->
+      <map:match pattern="lenya-screen.xsl">
+        <map:generate src="fallback://lenya/xslt/util/page2xhtml.xsl"/>
+        <map:serialize type="xml"/>
+      </map:match>
+      
+      <map:match pattern="**">
+        <map:mount check-reload="true" reload-method="synchron" src="global-sitemap.xmap" uri-prefix=""/>
+      </map:match>
+      
+    </map:pipeline>
+    
+    <map:pipeline>
+      
+      <map:match pattern="ac.login" type="usecase">
+        <map:mount check-reload="yes" reload-method="synchron" src="{fallback:lenya/modules/usecase/usecase.xmap}" uri-prefix=""/>
+      </map:match>
+      <map:match pattern="ac.logout" type="usecase">
+        <map:mount check-reload="yes" reload-method="synchron" src="{fallback:lenya/modules/usecase/usecase.xmap}" uri-prefix=""/>
+      </map:match>
+      
+      <!-- favicon -->
+      <map:match pattern="favicon.ico">
+        <map:read mime-type="image/x-icon" src="lenya/resources/images/lenya.ico"/>
+      </map:match>
+    </map:pipeline>
+    
     <map:pipeline>
 
     <map:match pattern="**">

Modified: lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap?rev=619698&r1=619697&r2=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap Thu Feb  7 16:20:32 2008
@@ -21,13 +21,6 @@
   xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   
     <map:transformer name="metaData" logger="lenya.sitemap.transformer.metaData" src="org.apache.lenya.cms.cocoon.transformation.MetaDataTransformer"/>
-    <map:transformer name="i18n" logger="sitemap.transformer.i18n" src="org.apache.cocoon.transformation.I18nTransformer">
-      <catalogues default="cmsui">
-         <catalogue id="cmsui" name="cmsui" location="cocoon://i18n-catalogue/"/>
-       </catalogues>
-       <untranslated-text>untranslated</untranslated-text>
-       <cache-at-startup>true</cache-at-startup>
-    </map:transformer>
     <map:transformer name="pattern" 
        src="org.apache.cocoon.transformation.PatternTransformer" 
        logger="sitemap.transformer.pattern">

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml?rev=619698&r1=619697&r2=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml Thu Feb  7 16:20:32 2008
@@ -18,7 +18,8 @@
 
 <!-- $Id$ -->
 
-<catalogue xml:lang="en" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<catalogue xml:lang="en" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns="http://apache.org/cocoon/i18n/2.1">
 
   <!-- common used words -->
   <message key="Save">Save</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml?rev=619698&r1=619697&r2=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml Thu Feb  7 16:20:32 2008
@@ -18,7 +18,8 @@
 
 <!-- $Id$ -->
 
-<catalogue xml:lang="de" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<catalogue xml:lang="de" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns="http://apache.org/cocoon/i18n/2.1">
 
   <!-- common used words -->
   <message key="Save">Speichern</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml?rev=619698&r1=619697&r2=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml Thu Feb  7 16:20:32 2008
@@ -25,7 +25,8 @@
 
 -->
 
-<catalogue xml:lang="es" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<catalogue xml:lang="es" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns="http://apache.org/cocoon/i18n/2.1">
 
   <!-- common used words -->
   <message key="Save">Guardar</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml?rev=619698&r1=619697&r2=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml Thu Feb  7 16:20:32 2008
@@ -21,7 +21,8 @@
 	@translators Olivier Lange <wire at petit-atelier dot ch>
 	-->
 
-<catalogue xml:lang="fr" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<catalogue xml:lang="fr" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns="http://apache.org/cocoon/i18n/2.1">
 
   <!-- common used words -->
   <message key="Save">Enregistrer</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml?rev=619698&r1=619697&r2=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml Thu Feb  7 16:20:32 2008
@@ -19,7 +19,8 @@
   @translators Giampaolo Trapasso  <trapo at trapo dot it>
 -->
 
-<catalogue xml:lang="it" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<catalogue xml:lang="it" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns="http://apache.org/cocoon/i18n/2.1">
 	<!-- common used words -->
 	<message key="Save">Salva</message>
 	<message key="Submit">Sottoponi</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml?rev=619698&r1=619697&r2=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml Thu Feb  7 16:20:32 2008
@@ -18,7 +18,8 @@
 
 <!-- $Id$ -->
 
-<catalogue xml:lang="ja" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<catalogue xml:lang="ja" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns="http://apache.org/cocoon/i18n/2.1">
 
   <!-- common used words -->
   <message key="Save">保存</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml?rev=619698&r1=619697&r2=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml Thu Feb  7 16:20:32 2008
@@ -18,7 +18,8 @@
 
 <!-- $Id$ -->
 
-<catalogue xml:lang="nl" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<catalogue xml:lang="nl" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns="http://apache.org/cocoon/i18n/2.1">
 
   <!-- common used words -->
   <message key="Save">Opslaan</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml?rev=619698&r1=619697&r2=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml Thu Feb  7 16:20:32 2008
@@ -21,7 +21,8 @@
 
 -->
 
-<catalogue xml:lang="pt" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<catalogue xml:lang="pt" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns="http://apache.org/cocoon/i18n/2.1">
 
   <!-- common used words -->
   <message key="Save">Guardar</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml?rev=619698&r1=619697&r2=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml Thu Feb  7 16:20:32 2008
@@ -16,7 +16,8 @@
   limitations under the License.
 -->
 <!-- $Id: cmsui.xml 125536 2005-01-18 19:04:09Z gregor $ -->
-<catalogue xmlns:xhtml="http://www.w3.org/1999/xhtml" xml:lang="ru">
+<catalogue xmlns:xhtml="http://www.w3.org/1999/xhtml" xml:lang="ru"
+  xmlns="http://apache.org/cocoon/i18n/2.1">
 <!-- common used words -->
 <message key="Save">Сохранить</message>
 <message key="Submit">Отправить</message>

Copied: lenya/trunk/src/webapp/lenya/resources/i18n/modules2include.xsl (from r618794, lenya/trunk/src/webapp/lenya/resources/i18n/modules2xinclude.xsl)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/modules2include.xsl?p2=lenya/trunk/src/webapp/lenya/resources/i18n/modules2include.xsl&p1=lenya/trunk/src/webapp/lenya/resources/i18n/modules2xinclude.xsl&r1=618794&r2=619698&rev=619698&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/modules2xinclude.xsl (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/modules2include.xsl Thu Feb  7 16:20:32 2008
@@ -20,26 +20,28 @@
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:i="http://apache.org/cocoon/include/1.0"
   xmlns:lenya="http://apache.org/cocoon/lenya/publication/1.1"
   >
-
-  <xsl:param name="pubId"/>
-  <xsl:param name="catalogue"/>
-
-
-  <xsl:template match="catalogue">
-    <xsl:copy>
-      <xsl:copy-of select="@*|node()"/>
-      <xsl:apply-templates select="document('aggregate-fallback://config/publication.xml')/*/lenya:modules/lenya:module"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="lenya:module">
-    <xsl:if test="not(preceding-sibling::module[@name = current()/@name])">
-      <xi:include href="cocoon:/i18n-catalogue/module/{@name}/{$catalogue}"
-        xpointer="xpointer(/catalogue/message)"/>
-    </xsl:if>
-  </xsl:template>
+
+  <xsl:param name="catalogue"/>
+  <xsl:param name="pub"/>
+  
+  <xsl:template match="lenya:publication">
+    <catalogue>
+      <i:include src="aggregate-fallback://resources/i18n/{$catalogue}">
+        <i:fallback/>
+      </i:include>
+      <xsl:apply-templates select="lenya:modules/lenya:module"/>
+    </catalogue>
+  </xsl:template>
+  
+  <xsl:template match="lenya:module">
+    <xsl:if test="not(preceding-sibling::lenya:module[@name = current()/@name])">
+      <i:include src="aggregate-fallback://lenya/modules/{@name}/resources/i18n/{$catalogue}">
+        <i:fallback/>
+      </i:include>
+    </xsl:if>
+  </xsl:template>
 
 </xsl:stylesheet>
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.