kpiroumian 02/04/27 02:42:13
Modified: src/webapp/samples/i18n simple.xml simple.xsp site2html.xsl
Log:
Samples fixed to display number formatting.
Revision Changes Path
1.3 +1 -1 xml-cocoon2/src/webapp/samples/i18n/simple.xml
Index: simple.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/i18n/simple.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simple.xml 25 Apr 2002 16:34:32 -0000 1.2
+++ simple.xml 27 Apr 2002 09:42:13 -0000 1.3
@@ -41,7 +41,7 @@
<para title="Number formatting (not translated)"
name="article" i18n:attr="name">
<i18n:translate>
Number : {0} | Currency: {1} | Percent: {2},
processed on: {3}
- <i18n:param type="currency" src-locale="en"
value="1703.74" />
+ <i18n:param type="number" src-locale="en"
value="1703.74" />
<i18n:param type="currency"
src-locale="en">27.24</i18n:param>
<i18n:param type="percent"
src-locale="en">1.2</i18n:param>
<i18n:param type="date-time" pattern="MEDIUM"/>
1.4 +2 -4 xml-cocoon2/src/webapp/samples/i18n/simple.xsp
Index: simple.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/i18n/simple.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- simple.xsp 26 Apr 2002 16:17:37 -0000 1.3
+++ simple.xsp 27 Apr 2002 09:42:13 -0000 1.4
@@ -29,8 +29,7 @@
<sub-title>
<i18n:translate>
<i18n:text>count_title</i18n:text>
- <!-- FIXME (KP): change the type to 'number' -->
- <i18n:param type="currency" pattern="000000">
+ <i18n:param type="number" pattern="000000">
<xsp:expr>count</xsp:expr>
</i18n:param>
<i18n:param type="date-time" src-pattern="EEE MMM dd hh:mm:ss zzz
yyyy" src-locale="en" pattern="MEDIUM">
@@ -72,8 +71,7 @@
<para title="Number formatting (not translated)" name="article"
i18n:attr="name">
<i18n:translate>
Number : {0} | Currency: {1} | Percent: {2},
processed on: {3}
- <!-- FIXME (KP): change the type to 'number'
-->
- <i18n:param type="percent" pattern="#"
src-locale="en">
+ <i18n:param type="number" src-locale="en">
<xsp:expr>17 + 3 + 1974</xsp:expr>
</i18n:param>
<i18n:param type="currency" src-locale="en">
1.3 +1 -1 xml-cocoon2/src/webapp/samples/i18n/site2html.xsl
Index: site2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/i18n/site2html.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- site2html.xsl 26 Apr 2002 16:17:37 -0000 1.2
+++ site2html.xsl 27 Apr 2002 09:42:13 -0000 1.3
@@ -1 +1 @@
-<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:param name="locale" />
<xsl:param name="page" />
<xsl:template match="site">
<html>
<head>
<title>
<xsl:value-of select="page/title"
/>
</title>
<link rel="stylesheet" href="page.css"
type="text/css"/>
</head>
<body>
<table
class="path">
<tr>
<td>
<!-- FIXME (KP): change to '..' -->
<a
href="../welcome">Apache Cocoon Samples</a> > <span
class="current">Internationalization (i18n) and Localization (l10n)</span>
</td>
</tr>
</table>
<table
class="topline"><tr><td> </td></tr></table>
<table
cellspacing="0" cellpadding="0" summary="content pane">
<tr>
<td width="5" class="navbar"> </td>
<td
rowspan="2" valign="top" nowrap="nowrap" width="300">
<xsl:apply-templates select="table[@class='menu']"/>
</td>
<td valign="top" class="navbar" align="left">
Locale: <xsl:value-of select="$locale" />
</td>
<td width="*" valign="top" class="navbar" align="right">
Page: <xsl:value-of select="$page" />
</td>
</tr>
<tr>
<td> </td>
<td class="content" valign="top" colspan="2">
<xsl:apply-templates select="page"/>
</td>
</tr>
</table>
<table>
<tr>
<td class="copyright">
Copyright (c) 1999-2002 <a href="http://www.apache.org/";>Apache Software
Foundation</a>. All Rights Reserved.
</td>
</tr>
</table>
</body>
</html>
</xsl:template>
<xsl:template match="node()|@*" priority="-1">
<xsl:copy>
<xsl:apply-templates select="@*"/>
<xsl:apply-templates/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
\ No newline at end of file
+<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:param name="locale" />
<xsl:param name="page" />
<xsl:template match="site">
<html>
<head>
<title>
<xsl:value-of select="page/title"
/>
</title>
<link rel="stylesheet" href="page.css"
type="text/css"/>
</head>
<body>
<table
class="path">
<tr>
<td>
<!-- FIXME (KP): remove 'welcome' when solved redirection problem -->
<a href="../../welcome">Apache Cocoon Main</a> > <a
href="../welcome">Samples</a> > <span
class="current">Internationalization (i18n) and Localization (l10n)</span>
</td>
</tr>
</table>
<table
class="topline"><tr><td> </td></tr></table>
<table
cellspacing="0" cellpadding="0" summary="content pane">
<tr>
<td width="5" class="navbar"> </td>
<td
rowspan="2" valign="top" nowrap="nowrap" width="300">
<xsl:apply-templates select="table[@class='menu']"/>
</td>
<td valign="top" class="navbar" align="left">
Locale: <xsl:value-of select="$locale" />
</td>
<td width="*" valign="top" class="navbar" align="right">
Page: <xsl:value-of select="$page" />
</td>
</tr>
<tr>
<td> </td>
<td class="content" valign="top" colspan="2">
<xsl:apply-templates select="page"/>
</td>
</tr>
</table>
<table>
<tr>
<td class="copyright">
Copyright (c) 1999-2002 <a href="http://www.apache.org/";>Apache Software
Foundation</a>. All Rights Reserved.
</td>
</tr>
</table>
</body>
</html>
</xsl:template>
<xsl:template match="node()|@*" priority="-1">
<xsl:copy>
<xsl:apply-templates select="@*"/>
<xsl:apply-templates/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
\ No newline at end of file
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
