cziegeler 01/09/26 06:12:01
Modified: webapp/i18n/translations messages_de.xml
webapp/stylesheets simple-samples2html.xsl
xdocs caching.xml i18n-transformer.xml index.xml
mrustore.xml svg-serializer.xml
Log:
[C2][Patch] slightly improved samples and docs
Submitted by: Hans Ulrich Niedermann [[EMAIL PROTECTED]]
Revision Changes Path
1.2 +5 -5 xml-cocoon2/webapp/i18n/translations/messages_de.xml
Index: messages_de.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/i18n/translations/messages_de.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- messages_de.xml 2001/07/19 11:22:22 1.1
+++ messages_de.xml 2001/09/26 13:12:01 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- CVS $Id: messages_de.xml,v 1.1 2001/07/19 11:22:22 dims Exp $ -->
+<!-- CVS $Id: messages_de.xml,v 1.2 2001/09/26 13:12:01 cziegeler Exp $ -->
<!-- German message catalogue file for cocoon2 sample webapp -->
@@ -13,12 +13,12 @@
<message key="lang_id4">es</message>
<message key="lang_id5">hy</message>
<message key="language">Deutsch</message>
- <message key="language1">Englische</message>
- <message key="language2">Russe</message>
+ <message key="language1">Englisch</message>
+ <message key="language2">Russisch</message>
<message key="language3">Polnisch</message>
<message key="language4">Spanisch</message>
- <message key="language5">Armenier</message>
- <message key="titletext">Herzlich willkommen, Internationalisierung!</message>
+ <message key="language5">Armenisch</message>
+ <message key="titletext">Herzlich willkommen zur
Internationalisierung!</message>
<message key="doclink">Näheres unter der i18n Dokumentation:</message>
<message key="first">Erstens</message>
<message key="second">Zweitens</message>
1.3 +8 -6 xml-cocoon2/webapp/stylesheets/simple-samples2html.xsl
Index: simple-samples2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/stylesheets/simple-samples2html.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simple-samples2html.xsl 2001/06/01 17:22:39 1.2
+++ simple-samples2html.xsl 2001/09/26 13:12:01 1.3
@@ -27,16 +27,17 @@
</xsl:template>
<xsl:template match="samples">
- <xsl:variable name="t-size" select="count(group)"/>
- <xsl:variable name="half" select="round($t-size div 2)"/>
+ <xsl:variable name="all-samples" select="count(group/sample)"/>
+ <xsl:variable name="half-samples" select="round($all-samples div 2)"/>
<table width="100%">
<tr>
<td valign="top">
<xsl:for-each select="group">
- <xsl:variable name="here" select="position()"/>
+ <xsl:variable name="group-position" select="position()"/>
+ <xsl:variable name="current-sample" select="1 + count(../group[position()
<= $group-position]/sample)"/>
<xsl:choose>
- <xsl:when test="../group[$here<=$half]">
+ <xsl:when test="$current-sample <= $half-samples">
<table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2"
width="97%" align="center">
<tr>
<td bgcolor="#0086b2" width="100%" align="left">
@@ -59,9 +60,10 @@
</td>
<td valign="top">
<xsl:for-each select="group"> <!-- [position()<=$half] -->
- <xsl:variable name="here" select="position()"/>
+ <xsl:variable name="group-position" select="position()"/>
+ <xsl:variable name="current-sample" select="1 + count(../group[position()
<= $group-position]/sample)"/>
<xsl:choose>
- <xsl:when test="../group[$here>$half]">
+ <xsl:when test="not($current-sample <= $half-samples)">
<table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2"
width="97%" align="center">
<tr>
<td bgcolor="#0086b2" width="100%" align="left">
1.12 +6 -6 xml-cocoon2/xdocs/caching.xml
Index: caching.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/caching.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- caching.xml 2001/09/26 12:48:57 1.11
+++ caching.xml 2001/09/26 13:12:01 1.12
@@ -17,14 +17,14 @@
</s1>
<s1 title="Overview">
<p>The caching algorithm of @docname@ has a very flexible and powerful
design.
- The used algorithms and components are not hardcoded into the core
of
+ The algorithms and components used are not hardcoded into the core
of
@docname@. They can be configured using Avalon components.</p>
- <p>This document describes the available components for caching,
- how they can be configured and how to implement own cacheable
components.
+ <p>This document describes the components available for caching,
+ how they can be configured and how to implement your own cacheable
components.
</p>
</s1>
<s1 title="Caching of event pipelines">
- <p>The algorithm used for caching depends on the configured event
pipeline.
+ <p>The algorithm used for caching depends on the event pipeline
configured.
For more information about configuration see the chapter below.</p>
<p>The following subchapters describe the available caching
algorithms.</p>
<s2 title="The CachingEventPipeline">
@@ -73,7 +73,7 @@
the new validity objects in the cache.</p>
<s3 title="Examples">
<p>If you have the following pipeline:</p>
-
<p>Generator[type=file|src=a.xml]->Transformer[type="xslt"|src=a.xsl]->Serializer</p>
+ <p>Generator[type=file|src=a.xml] ->
Transformer[type="xslt"|src=a.xsl] -> Serializer</p>
<p>The file generator is cacheable and generates a key
which hashes the src
(or the filename) to build the key. The cache
validity object uses the last modification date of the
xml file.</p>
@@ -86,7 +86,7 @@
If it is still valid, the cached content is directly
feed into
the serializer.</p>
<p>Only part of the following pipeline is cached:</p>
-
<p>Generator[type=file|src=a.xml]->Transformer[type="xslt"|src=a.xsl]->Transformer[type=sql]->Transformer[type="xslt"|src=b.xsl]->Serializer</p>
+ <p>Generator[type=file|src=a.xml] ->
Transformer[type="xslt"|src=a.xsl] -> Transformer[type=sql] ->
Transformer[type="xslt"|src=b.xsl] -> Serializer</p>
<p>The file generator is cacheable and generates a key
which hashes the src
(or the filename) to build the key. The cache
validity object uses the last modification date of the
xml file.</p>
1.10 +9 -9 xml-cocoon2/xdocs/i18n-transformer.xml
Index: i18n-transformer.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/i18n-transformer.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i18n-transformer.xml 2001/09/26 12:48:57 1.9
+++ i18n-transformer.xml 2001/09/26 13:12:01 1.10
@@ -19,7 +19,7 @@
<body>
<s1 title="I18n Transformer">
<p>
- Developing and maintaining multi-language sites is
common problem for web developers.
+ Developing and maintaining multi-language sites is a
common problem for web developers.
The usage of XML and XSL makes this task much more
easier, especially with @docname@'s
content, logic and presentation separation concept.
</p>
@@ -28,11 +28,11 @@
is based on a transformer - <link
href="javadocs/org/apache/cocoon/transformation/I18nTransformer.html">
<code>I18nTransformer</code>
</link>
- , it uses XML dictionaries for all the i18n data. The
namespace of i18n is defined as follows:
+ , which uses XML dictionaries for all the i18n data.
The namespace of i18n is defined as follows:
<code>xmlns:i18n="http://apache.org/cocoon/i18n/2.0";</code>
</p>
<p>
- First implementation was developed by <link
href="mailto:[EMAIL PROTECTED]";>Lassi Immonen</link>. In this implementation
syntax was changed according to the <link
href="http://www.infozone-group.org";>Infozone Group's</link> i18n proposal (with a
little difference) and some new features were implemented.
+ The first implementation was developed by <link
href="mailto:[EMAIL PROTECTED]";>Lassi Immonen</link>. In this implementation
the syntax was changed according to the <link
href="http://www.infozone-group.org";>Infozone Group</link>'s i18n proposal (with small
changes) and some new features were implemented.
</p>
<p>
Enhancements for number, date and time have been
contributed by <link href="mailto:[EMAIL PROTECTED]";>Michael Enke</link>.
@@ -45,7 +45,7 @@
</s1>
<s1 title="Features supported">
<p>
- Following features are supported by the i18n
transformer:
+ The following features are supported by the
i18n transformer:
</p>
<ul>
<li>Text translation</li>
@@ -65,18 +65,18 @@
<i18n:text>This text will be translated.</i18n:text>
</para>]]></source>
<p>
- Text inside the
<code><![CDATA[<i18n:text>]]></code> will be used as a key to find the
+ The text inside the
<code><![CDATA[<i18n:text>]]></code> will be used as a key to find the
translation in the dictionary. All attributes
that are listed in the <code><![CDATA[<i18n:attr>]]></code> attribute also will be
translated and their values will be used as dictionary keys.
</p>
<note>
This i18n approach was re-designed to
implement i18n of dates, currencies, etc.
- Although supported possibilities are quite
enough for complicated formatting, but in some cases you will need to use XSP to
achieve more flexibility.
+ Although the possibilities supported allow for
complicated formatting, you will need to use XSP to achieve more flexibility in some
cases.
</note>
</s1>
<s1 title="Markup content for translation">
<s2 title="Simple text translation">
<p>
- To translate simple text we use the
<code><![CDATA[<i18n:text>]]></code> tag:
+ To translate some simple text we use the
<code><![CDATA[<i18n:text>]]></code> tag:
</p>
<source><![CDATA[
<i18n:text>Text to be translated</i18n:text>]]></source>
@@ -86,9 +86,9 @@
<p>
The 'i18n:key' attribute can be used to specify a
special key for
the dictionary. Normally, the text itself is used as
the key to find
- the translation in the dictionary. If we specify the
attribute this
+ the translation in the dictionary. If we specify the
'i18n:key' attribute this
key is used to find the translation and the text
itself is used as the default value,
- if translation not found.
+ if no translation can be found.
</p>
<source><![CDATA[
<i18n:text i18n:key="key_text">Default value</i18n:text>]]></source>
1.11 +2 -2 xml-cocoon2/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/index.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- index.xml 2001/09/26 12:48:57 1.10
+++ index.xml 2001/09/26 13:12:01 1.11
@@ -171,7 +171,7 @@
is simply not practical.</p>
<p>While in the HTML web model the page format and URL names
- where the only necessary contracts between individuals to create a world wide
+ were the only necessary contracts between individuals to create a world wide
web, in more structured information systems the number of contracts increases
by a significant factor due to the need of coherence between the
hosted information: common style, common design issues, common languages,
@@ -328,7 +328,7 @@
cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic \
checkout -r cocoon_20_branch xml-cocoon2
</source>
- <p><sub>(Windows users: Do not enter '\' symbol, continue typing on the same
line.)</sub></p>
+ <p><sub>(Windows users: Do not enter the '\' symbol, continue typing on the same
line.)</sub></p>
<p>For more information on CVS access, refer to the CVS docs on this web site.</p>
<note>To get the current version of @docname@ 2 you have to checkout the
branch called cocoon_20_branch. The HEAD of the cvs repository is used
1.6 +3 -3 xml-cocoon2/xdocs/mrustore.xml
Index: mrustore.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/mrustore.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mrustore.xml 2001/09/26 12:48:57 1.5
+++ mrustore.xml 2001/09/26 13:12:01 1.6
@@ -17,10 +17,10 @@
<s1 title="Overview">
<p>The MRUMemoryStore was developed to provide a standard algorithm to
store data in memory. For web-based applications the MRU (Most Recently
Used) algorithm
- is very suitable, because the most accessed object is always on "top".
+ is very suitable, because the object most frequently accessed is always on
"top".
</p>
- <p> If configured the objects are also swaped to the filesystem, to hold them
- in an persitent state over JVM restarts.
+ <p>If configured accordingly, the objects are also swapped to the filesystem,
to hold them
+ in a persistent state over JVM restarts.
</p>
</s1>
<s1 title="Implementation">
1.4 +8 -4 xml-cocoon2/xdocs/svg-serializer.xml
Index: svg-serializer.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/svg-serializer.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- svg-serializer.xml 2001/09/26 12:48:58 1.3
+++ svg-serializer.xml 2001/09/26 13:12:01 1.4
@@ -47,8 +47,10 @@
<source><![CDATA[
<map:serializers>
<map:serializer>
- <map:serializer name="svg2jpeg" mime-type="image/jpeg"
src="org.apache.cocoon.serialization.SVGSerializer">
- <parameter name="transcoder"
value="org.apache.batik.transcoder.image.JPEGTranscoder"/>
+ <map:serializer name="svg2jpeg" mime-type="image/jpeg"
+ src="org.apache.cocoon.serialization.SVGSerializer">
+ <parameter name="transcoder"
+ value="org.apache.batik.transcoder.image.JPEGTranscoder"/>
</map:serializer>
<map:serializers>
...
@@ -75,8 +77,10 @@
<source><![CDATA[
<map:serializers>
<map:serializer>
- <map:serializer name="svg2jpeg" mime-type="image/jpeg"
src="org.apache.cocoon.serialization.SVGSerializer">
- <parameter name="transcoder"
value="org.apache.batik.transcoder.image.JPEGTranscoder"/>
+ <map:serializer name="svg2jpeg" mime-type="image/jpeg"
+ src="org.apache.cocoon.serialization.SVGSerializer">
+ <parameter name="transcoder"
+ value="org.apache.batik.transcoder.image.JPEGTranscoder"/>
<parameter name="background_color" type="color" value="#00FF00"/>
</map:serializer>
<map:serializers>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
