You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2005/08/28 14:48:01 UTC
svn commit: r263870 - in /forrest/trunk:
main/webapp/resources/stylesheets/strip-text-elements.xsl
main/webapp/sitemap.xmap site-author/status.xml
Author: crossley
Date: Sun Aug 28 05:47:55 2005
New Revision: 263870
URL: http://svn.apache.org/viewcvs?rev=263870&view=rev
Log:
Strip remaining <i18n:text> elements that remain if i18n processing
has been disabled. This was causing invalid HTML output.
Added:
forrest/trunk/main/webapp/resources/stylesheets/strip-text-elements.xsl (with props)
Modified:
forrest/trunk/main/webapp/sitemap.xmap
forrest/trunk/site-author/status.xml
Added: forrest/trunk/main/webapp/resources/stylesheets/strip-text-elements.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/resources/stylesheets/strip-text-elements.xsl?rev=263870&view=auto
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/strip-text-elements.xsl (added)
+++ forrest/trunk/main/webapp/resources/stylesheets/strip-text-elements.xsl Sun Aug 28 05:47:55 2005
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ 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
+
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
+
+ <xsl:import href="copyover.xsl"/>
+
+ <xsl:template match="i18n:text">
+ <xsl:apply-templates/>
+ </xsl:template>
+
+</xsl:stylesheet>
Propchange: forrest/trunk/main/webapp/resources/stylesheets/strip-text-elements.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?rev=263870&r1=263869&r2=263870&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Sun Aug 28 05:47:55 2005
@@ -257,6 +257,13 @@
<map:parameter name="locale" value="{request:locale}"/>
</map:transform>
</map:when>
+ <map:otherwise>
+ <!--
+ FIXME: strip remaining <i18n:text> elements.
+ workaround for http://issues.apache.org/jira/browse/FOR-592
+ -->
+ <map:transform src="{forrest:stylesheets}/strip-text-elements.xsl"/>
+ </map:otherwise>
</map:select>
<!--
FIXME: strip_namespace is because this bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=35348
Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/status.xml?rev=263870&r1=263869&r2=263870&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Sun Aug 28 05:47:55 2005
@@ -131,6 +131,11 @@
<link href="site:v0.80//upgrading_08">upgrading to v0.8</link>
</action>
+ <action context="code" type="add" dev="DC" fixes-bug="FOR-592">
+ Strip remaining <i18n:text> elements that remain if i18n processing
+ has been disabled. This was causing invalid HTML output.
+ </action>
+
<action context="code" type="add" dev="TS">
Refactored the view resolver code of the internal.view plugin. Created an action that
is doing the same as before the combination of sitemap+xsl. <br/>Added 2 java classes to package