vgritsenko    2003/12/09 13:34:01

  Modified:    src/webapp/samples/i18n simple.xsp
  Log:
  reformat and minor tweaks
  
  Revision  Changes    Path
  1.6       +99 -96    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- simple.xsp        25 Nov 2003 19:33:36 -0000      1.5
  +++ simple.xsp        9 Dec 2003 21:34:01 -0000       1.6
  @@ -1,102 +1,105 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +
   <xsp:page language="java" 
  -    xmlns:xsp="http://apache.org/xsp"; 
  -    xmlns:xsp-request="http://apache.org/xsp/request/2.0"; 
  -    xmlns:i18n="http://apache.org/cocoon/i18n/2.1";>
  +          xmlns:xsp="http://apache.org/xsp"; 
  +          xmlns:xsp-request="http://apache.org/xsp/request/2.0"; 
  +          xmlns:i18n="http://apache.org/cocoon/i18n/2.1";>
  +
  +  <xsp:logic>
  +    private static int count = 0;
  +  </xsp:logic>
   
  +  <document i18n:attr="language" language="language">
  +    <xsp-request:get-session/>
       <xsp:logic>
  -        private static int count = 0;
  +      synchronized (this) {
  +          count++;
  +      }
       </xsp:logic>
  -    <document i18n:attr="language" language="language">
  -        <xsp-request:get-session/>
  -        <xsp:logic>
  -            synchronized (this) {
  -                count++;
  -            }
  -        </xsp:logic>
  -        <title>
  -            <i18n:text>titletext</i18n:text>
  -        </title>
  -        <form method="GET">
  -            <input type="text" name="username">
  -                <xsp:attribute name="value"><xsp-request:get-parameter 
name="username" default="[yourname]" as="string" 
form-encoding="UTF-8"/></xsp:attribute>
  -            </input>
  -            <input type="submit" name="submit" value="Submit"/>
  -        </form>
  -        <annotation>
  -            <i18n:translate>
  -                <i18n:text key="doclink"/>
  -                <i18n:param>
  -                    <link 
href="http://cocoon.apache.org/2.1/userdocs/transformers/i18n-transformer.html";>Cocoon
 2 Web Site</link>
  -                </i18n:param>
  -            </i18n:translate>
  -        </annotation>
  -        <sub-title>
  -            <i18n:translate>
  -                <i18n:text key="count_title"/>
  -                <i18n:param type="number" pattern="000000">
  -                    <xsp:expr>count</xsp:expr>
  -                </i18n:param>
  -                <i18n:param>
  -                    <i18n:date-time src-pattern="EEE MMM dd hh:mm:ss zzz 
yyyy" src-locale="en" pattern="MEDIUM">
  -                        <xsp:expr>new Date()</xsp:expr>
  -                    </i18n:date-time>
  -                </i18n:param>
  -            </i18n:translate>
  -        </sub-title>
  -        <content>
  -            <para title="first" name="article" i18n:attr="title name">
  -                <i18n:text key="a_key">article_text1</i18n:text>
  -            </para>
  -            <para title="second" name="article" i18n:attr="title name">
  -                <i18n:text>article_text2</i18n:text>
  -            </para>
  -            <para title="third" name="article" i18n:attr="title name">
  -                <i18n:translate>
  -                    <i18n:text key="Hello"/>
  -                    <i18n:param>
  -                        <strong>
  -                            <xsp-request:get-parameter name="username" 
default="none" as="string" form-encoding="UTF-8"/>
  -                        </strong>
  -                    </i18n:param>
  -                </i18n:translate>
  -            </para>
  -            <para title="forth" name="article" i18n:attr="title name">
  -                <i18n:translate>
  -                    One = {one}, two = {two}, {third}! {forth}
  -                    This line is not translated {forth}
  -                    <i18n:param name="one">
  -                        <i18n:text>
  -                            <xsp:expr>"ONE".toLowerCase()</xsp:expr>
  -                        </i18n:text>
  -                    </i18n:param>
  -                    <i18n:param name="two">
  -                        <i18n:text>two</i18n:text>
  -                    </i18n:param>
  -                    <i18n:param name="third">baby</i18n:param>
  -                    <i18n:param name="forth">~</i18n:param>
  -                </i18n:translate>
  -            </para>
  -            <para title="Number formatting (not translated)" name="article" 
i18n:attr="name">
  -                <i18n:translate>
  -                    Number: {0} | Currency: {1} | Percent: {2}, processed 
on: {3}
  -                    <!--Old format: i18n:param type="number" src-locale="en" 
value="1703.74" /-->
  -                    <i18n:param>
  -                        <i18n:number src-locale="en"><xsp:expr>17 + 3 + 
1974</xsp:expr></i18n:number>
  -                    </i18n:param>
  -                    <!--Old format: i18n:param type="currency" 
src-locale="en">27.24</i18n:param-->
  -                    <i18n:param>
  -                        <i18n:number type="currency" 
src-locale="en"><xsp:expr>2002.0 / 28.0</xsp:expr></i18n:number>
  -                    </i18n:param>
  -                    <i18n:param><i18n:number type="percent" src-locale="en" 
value="1.205"/></i18n:param>
  -                    <i18n:param><i18n:date-time 
pattern="MEDIUM"/></i18n:param>
  -                </i18n:translate>
  -            </para>
  -        </content>
  -        <bottom>
  -            <copyright>
  -                <i18n:text>copyright</i18n:text>
  -            </copyright>
  -        </bottom>
  -    </document>
  +    <title>
  +      <i18n:text>titletext</i18n:text>
  +    </title>
  +    <form method="GET">
  +      <input type="text" name="username">
  +        <xsp:attribute name="value"><xsp-request:get-parameter 
name="username" default="[yourname]" as="string" 
form-encoding="UTF-8"/></xsp:attribute>
  +      </input>
  +      <input type="submit" name="submit" value="Submit"/>
  +    </form>
  +    <annotation>
  +      <i18n:translate>
  +        <i18n:text key="doclink"/>
  +        <i18n:param>
  +          <link 
href="http://cocoon.apache.org/2.1/userdocs/transformers/i18n-transformer.html";>Cocoon
 2 Web Site</link>
  +        </i18n:param>
  +      </i18n:translate>
  +    </annotation>
  +    <sub-title>
  +      <i18n:translate>
  +        <i18n:text key="count_title"/>
  +        <i18n:param type="number" pattern="000000">
  +          <xsp:expr>count</xsp:expr>
  +        </i18n:param>
  +        <i18n:param>
  +          <i18n:date-time src-pattern="EEE MMM dd hh:mm:ss zzz yyyy" 
src-locale="en" pattern="MEDIUM">
  +            <xsp:expr>new Date()</xsp:expr>
  +          </i18n:date-time>
  +        </i18n:param>
  +      </i18n:translate>
  +    </sub-title>
  +
  +    <content>
  +      <para title="first" name="article" i18n:attr="title name">
  +        <i18n:text key="a_key">article_text1</i18n:text>
  +      </para>
  +      <para title="second" name="article" i18n:attr="title name">
  +        <i18n:text>article_text2</i18n:text>
  +      </para>
  +      <para title="third" name="article" i18n:attr="title name">
  +        <i18n:translate>
  +          <i18n:text key="Hello"/>
  +          <i18n:param>
  +            <strong>
  +              <xsp-request:get-parameter name="username" default="none" 
as="string" form-encoding="UTF-8"/>
  +            </strong>
  +          </i18n:param>
  +        </i18n:translate>
  +      </para>
  +      <para title="forth" name="article" i18n:attr="title name">
  +        <i18n:translate>
  +          One = {one}, two = {two}, {third}! {forth}
  +          This line is not translated {forth}
  +          <i18n:param name="one">
  +            <i18n:text>
  +              <xsp:expr>"ONE".toLowerCase()</xsp:expr>
  +            </i18n:text>
  +          </i18n:param>
  +          <i18n:param name="two">
  +            <i18n:text>two</i18n:text>
  +          </i18n:param>
  +          <i18n:param name="third">baby</i18n:param>
  +          <i18n:param name="forth">~</i18n:param>
  +        </i18n:translate>
  +      </para>
  +      <para title="Number formatting (not translated)" name="article" 
i18n:attr="name">
  +        <i18n:translate>
  +          Number: {0} | Currency: {1} | Percent: {2} | Processed on: {3}
  +          <!--Old format: i18n:param type="number" src-locale="en" 
value="1703.74" /-->
  +          <i18n:param>
  +            <i18n:number src-locale="en"><xsp:expr>17 + 3 + 
1974</xsp:expr></i18n:number>
  +          </i18n:param>
  +          <!--Old format: i18n:param type="currency" 
src-locale="en">27.24</i18n:param-->
  +          <i18n:param>
  +            <i18n:number type="currency" src-locale="en"><xsp:expr>2002.0 / 
28.0</xsp:expr></i18n:number>
  +          </i18n:param>
  +          <i18n:param><i18n:number type="percent" src-locale="en" 
value="1.205"/></i18n:param>
  +          <i18n:param><i18n:date-time pattern="MEDIUM"/></i18n:param>
  +        </i18n:translate>
  +      </para>
  +    </content>
  +    <bottom>
  +      <copyright>
  +        <i18n:text>copyright</i18n:text>
  +      </copyright>
  +    </bottom>
  +  </document>
   </xsp:page>
  
  
  

Reply via email to