joerg 2003/09/30 13:14:18
Modified: src/blocks/apples/samples/calc getOperator.xsp
getNumberB.xsp
src/webapp/samples/i18n simple.xsp simple.xml
Log:
further sample fixes (at least partly, see my upcoming mail)
Revision Changes Path
1.2 +3 -3 cocoon-2.1/src/blocks/apples/samples/calc/getOperator.xsp
Index: getOperator.xsp
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/apples/samples/calc/getOperator.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- getOperator.xsp 29 Aug 2003 22:22:05 -0000 1.1
+++ getOperator.xsp 30 Sep 2003 20:14:18 -0000 1.2
@@ -16,13 +16,13 @@
<xsp:attribute name="action"><xsp:expr><jpath:continuation/>+
".continue"</xsp:expr></xsp:attribute>
<para>a =
<a>
- <xsp:attribute
name="href"><xsp:expr><jpath:continuation/>+".continue?change=a"</xsp:expr></xsp:attribute>
+ <xsp:attribute
name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberA"</xsp:expr></xsp:attribute>
<strong><jpath:value-of select="a"/></strong>
</a>
</para>
<para>b =
<a>
- <xsp:attribute
name="href"><xsp:expr><jpath:continuation/>+".continue?change=b"</xsp:expr></xsp:attribute>
+ <xsp:attribute
name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberB"</xsp:expr></xsp:attribute>
<strong><jpath:value-of select="b"/></strong>
</a>
</para>
1.2 +2 -2 cocoon-2.1/src/blocks/apples/samples/calc/getNumberB.xsp
Index: getNumberB.xsp
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/calc/getNumberB.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- getNumberB.xsp 29 Aug 2003 22:22:05 -0000 1.1
+++ getNumberB.xsp 30 Sep 2003 20:14:18 -0000 1.2
@@ -16,7 +16,7 @@
<xsp:attribute
name="action"><xsp:expr><jpath:continuation/>+".continue"</xsp:expr></xsp:attribute>
<para>a =
<a>
- <xsp:attribute
name="href"><xsp:expr><jpath:continuation/>+".continue?change=a"</xsp:expr></xsp:attribute>
+ <xsp:attribute
name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberA"</xsp:expr></xsp:attribute>
<strong><jpath:value-of select="a"/></strong>
</a>
</para>
1.4 +1 -4 cocoon-2.1/src/webapp/samples/i18n/simple.xsp
Index: simple.xsp
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/i18n/simple.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- simple.xsp 20 May 2003 00:51:41 -0000 1.3
+++ simple.xsp 30 Sep 2003 20:14:18 -0000 1.4
@@ -27,10 +27,7 @@
<i18n:translate>
<i18n:text i18n:key="doclink"/>
<i18n:param>
- <link>
-
<href>http://cocoon.apache.org/2.1/userdocs/transformers/i18n-transformer.html</href>
- <title>Cocoon 2 Web Site</title>
- </link>
+ <link
href="http://cocoon.apache.org/2.1/userdocs/transformers/i18n-transformer.html";>Cocoon
2 Web Site</link>
</i18n:param>
</i18n:translate>
</annotation>
1.3 +2 -5 cocoon-2.1/src/webapp/samples/i18n/simple.xml
Index: simple.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/i18n/simple.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simple.xml 10 May 2003 11:34:09 -0000 1.2
+++ simple.xml 30 Sep 2003 20:14:18 -0000 1.3
@@ -10,16 +10,13 @@
<i18n:translate>
<i18n:text i18n:key="doclink"/>
<i18n:param>
- <link>
-
<href>http://cocoon.apache.org/2.1/userdocs/transformers/i18n-transformer.html</href>
- <title>Cocoon 2 Web Site</title>
- </link>
+ <link
href="http://cocoon.apache.org/2.1/userdocs/transformers/i18n-transformer.html";>Cocoon
2 Web Site</link>
</i18n:param>
</i18n:translate>
</annotation>
<content>
<i18n:if locale="ru">
- <para title="ru" name="i18n:when">
+ <para title="ru" name="i18n:when">
Этот текст отображается
только для <strong>русского</strong> языка.
</para>
</i18n:if>
