cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.2/src/webapp/samples/i18n tiered.xml simple2page.xsl sitemap.xmap simple.xsp simple.xml menu.xml multi.xml
Date Wed, 10 Mar 2004 10:20:25 GMT
cziegeler    2004/03/10 02:20:25

  Modified:    src/webapp/samples/i18n/translations messages_ja.xml
                        menu_de.xml messages_in.xml messages_pl.xml
                        messages_fr.xml messages_zh_TW.xml menu_ru.xml
                        messages_en.xml messages_zh_CN.xml
                        messages_fr_CH.xml menu_in.xml menu_en.xml
                        messages_hy.xml menu_el.xml messages_tr.xml
                        menu_zh_CN.xml messages_ru.xml menu_ko.xml
                        menu_zh_TW.xml messages_es.xml messages_ko.xml
                        menu.xml messages.xml messages_pt.xml
                        messages_de.xml messages_el.xml menu_ja.xml
               src/webapp/samples/i18n simple2page.xsl sitemap.xmap
                        simple.xsp simple.xml menu.xml multi.xml
  Added:       src/webapp/samples/i18n/translations/tiered messages_en.xml
                        messages_ru.xml
               src/webapp/samples/i18n tiered.xml
  Log:
  Update license
  
  Revision  Changes    Path
  1.1                  cocoon-2.2/src/webapp/samples/i18n/translations/tiered/messages_en.xml
  
  Index: messages_en.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
    Copyright 1999-2004 The Apache Software Foundation
  
    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.
  -->
  
  <!--+
      | English override message catalogue file for Cocoon 2 i18n sample
      |
      | CVS $Id: messages_en.xml,v 1.1 2004/03/10 10:20:24 cziegeler Exp $
      +-->
  
  <catalogue xml:lang="en">
      <message key="a_key">This is a tiered key value.</message>
  </catalogue>
  
  
  
  1.1                  cocoon-2.2/src/webapp/samples/i18n/translations/tiered/messages_ru.xml
  
  Index: messages_ru.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
    Copyright 1999-2004 The Apache Software Foundation
  
    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.
  -->
  
  <!--+
      | Russian override message catalogue file for Cocoon 2 i18n sample
      |
      | CVS $Id: messages_ru.xml,v 1.1 2004/03/10 10:20:24 cziegeler Exp $
      +-->
  
  <catalogue xml:lang="ru">
      <message key="a_key">Это локально перекрытое значение по ключу.</message>
  </catalogue>
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_ja.xml
  
  Index: messages_ja.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_ja.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_ja.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_ja.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Japanese message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/menu_de.xml
  
  Index: menu_de.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/menu_de.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- menu_de.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ menu_de.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="iso-8859-1"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | German message catalogue file for menu in Cocoon 2 i18n sample
  
  
  
  1.5       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_in.xml
  
  Index: messages_in.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_in.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- messages_in.xml	29 Jul 2003 02:36:30 -0000	1.4
  +++ messages_in.xml	10 Mar 2004 10:20:24 -0000	1.5
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Indonesian message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_pl.xml
  
  Index: messages_pl.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_pl.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_pl.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_pl.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Polish message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_fr.xml
  
  Index: messages_fr.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_fr.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_fr.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_fr.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | French message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_zh_TW.xml
  
  Index: messages_zh_TW.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_zh_TW.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_zh_TW.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_zh_TW.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Chinese message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/menu_ru.xml
  
  Index: menu_ru.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/menu_ru.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- menu_ru.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ menu_ru.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Russian message catalogue file for menu in Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_en.xml
  
  Index: messages_en.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_en.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_en.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_en.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | English message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_zh_CN.xml
  
  Index: messages_zh_CN.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_zh_CN.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_zh_CN.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_zh_CN.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Chinese message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_fr_CH.xml
  
  Index: messages_fr_CH.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_fr_CH.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_fr_CH.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_fr_CH.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | French (CH) message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/menu_in.xml
  
  Index: menu_in.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/menu_in.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- menu_in.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ menu_in.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Indonesian message catalogue file for menu in Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/menu_en.xml
  
  Index: menu_en.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/menu_en.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- menu_en.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ menu_en.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | English message catalogue file for menu in Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_hy.xml
  
  Index: messages_hy.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_hy.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_hy.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_hy.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Armenian message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/menu_el.xml
  
  Index: menu_el.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/menu_el.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- menu_el.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ menu_el.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Greek message catalogue file for menu in Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_tr.xml
  
  Index: messages_tr.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_tr.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_tr.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_tr.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Turkish message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/menu_zh_CN.xml
  
  Index: menu_zh_CN.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/menu_zh_CN.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- menu_zh_CN.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ menu_zh_CN.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Chinese message catalogue file for menu in Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_ru.xml
  
  Index: messages_ru.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_ru.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_ru.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_ru.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Russian message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/menu_ko.xml
  
  Index: menu_ko.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/menu_ko.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- menu_ko.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ menu_ko.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Korean message catalogue file for menu in Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/menu_zh_TW.xml
  
  Index: menu_zh_TW.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/menu_zh_TW.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- menu_zh_TW.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ menu_zh_TW.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Chinese message catalogue file for menu in Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_es.xml
  
  Index: messages_es.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_es.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_es.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_es.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Spanish message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_ko.xml
  
  Index: messages_ko.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_ko.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_ko.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_ko.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Korean message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/menu.xml
  
  Index: menu.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/menu.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- menu.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ menu.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Default (English) message catalogue file for menu in Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages.xml
  
  Index: messages.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Default (English) message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_pt.xml
  
  Index: messages_pt.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_pt.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_pt.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_pt.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Portuguese message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.4       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_de.xml
  
  Index: messages_de.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_de.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- messages_de.xml	29 Jul 2003 02:36:30 -0000	1.3
  +++ messages_de.xml	10 Mar 2004 10:20:24 -0000	1.4
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | German message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/messages_el.xml
  
  Index: messages_el.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/messages_el.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_el.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ messages_el.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Greek message catalogue file for Cocoon 2 i18n sample
  
  
  
  1.3       +16 -1     cocoon-2.2/src/webapp/samples/i18n/translations/menu_ja.xml
  
  Index: menu_ja.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/translations/menu_ja.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- menu_ja.xml	29 Jul 2003 02:36:30 -0000	1.2
  +++ menu_ja.xml	10 Mar 2004 10:20:24 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!--+
       | Japanese message catalogue file for menu in Cocoon 2 i18n sample
  
  
  
  1.2       +30 -0     cocoon-2.2/src/webapp/samples/i18n/simple2page.xsl
  
  Index: simple2page.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/simple2page.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- simple2page.xsl	10 May 2003 11:34:09 -0000	1.1
  +++ simple2page.xsl	10 Mar 2004 10:20:25 -0000	1.2
  @@ -1,4 +1,19 @@
   <?xml version="1.0"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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 xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
     <xsl:param name="locale"/>
     <xsl:param name="page"/>
  @@ -46,6 +61,21 @@
   
     <xsl:template match="book">
       <xsl:apply-templates select="menu"/>
  +  </xsl:template>
  +
  +  <xsl:template match="para">
  +    <p>
  +      <font color="navy">
  +        <b>
  +          <xsl:number format="0. "/>
  +          <xsl:value-of select="@name"/>
  +        </b>
  +        <xsl:text> </xsl:text>
  +        <xsl:value-of select="@title"/>
  +      </font>
  +      <br/>
  +      <xsl:apply-templates select="text() | strong | i"/>
  +    </p>
     </xsl:template>
   
     <!-- Current (open) menu -->
  
  
  
  1.7       +30 -2     cocoon-2.2/src/webapp/samples/i18n/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/sitemap.xmap,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sitemap.xmap	12 Aug 2003 15:48:02 -0000	1.6
  +++ sitemap.xmap	10 Mar 2004 10:20:25 -0000	1.7
  @@ -1,4 +1,19 @@
   <?xml version="1.0"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   
   <!-- CVS $Id$ -->
   
  @@ -17,11 +32,14 @@
           <catalogues default="messages">
             <catalogue id="messages" name="messages" location="translations"/>
             <catalogue id="menu" name="menu" location="translations"/>
  +          <catalogue id="tiered" name="messages">
  +        <location>translations/tiered</location>
  +        <location>translations</location>
  +      </catalogue>
           </catalogues>
           <cache-at-startup>true</cache-at-startup>
         </map:transformer>
       </map:transformers>
  -    <!-- =========================== Actions ================================= -->
       <map:actions>
         <!-- LocaleAction is used to set/get current users locale. See Javadocs for details. -->
         <map:action name="locale" logger="sitemap.action.locale" src="org.apache.cocoon.acting.LocaleAction">
  @@ -99,6 +117,16 @@
           <!-- Generate dynamic output (simple.xsp) -->
           <map:match pattern="*.xsp">
             <map:call resource="composite"/>
  +        </map:match>
  +
  +        <!-- A helper matcher for static content translation and generation -->
  +        <map:match pattern="content/tiered.xml">
  +          <map:generate src="tiered.xml"/>
  +          <map:transform type="i18n">
  +        <map:parameter name="default-catalogue-id" value="tiered"/>
  +            <map:parameter name="locale" value="{../locale}"/>
  +          </map:transform>
  +          <map:serialize/>
           </map:match>
   
           <!-- A helper matcher for static content translation and generation -->
  
  
  
  1.5       +114 -96   cocoon-2.2/src/webapp/samples/i18n/simple.xsp
  
  Index: simple.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/simple.xsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- simple.xsp	30 Sep 2003 20:14:18 -0000	1.4
  +++ simple.xsp	10 Mar 2004 10:20:25 -0000	1.5
  @@ -1,102 +1,120 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
  +
   <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 i18n: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 i18n: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 i18n: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 i18n: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>
  
  
  
  1.4       +85 -60    cocoon-2.2/src/webapp/samples/i18n/simple.xml
  
  Index: simple.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/simple.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- simple.xml	30 Sep 2003 20:14:18 -0000	1.3
  +++ simple.xml	10 Mar 2004 10:20:25 -0000	1.4
  @@ -1,63 +1,88 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<document xmlns:i18n="http://apache.org/cocoon/i18n/2.1" i18n:attr="language" language="language">
  -	<title>
  -		<i18n:text>titletext</i18n:text>
  -	</title>
  -	<sub-title>
  -		<i18n:date-time pattern="FULL"/>
  -	</sub-title>
  -	<annotation>
  -		<i18n:translate>
  -			<i18n:text i18n: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>
  -	<content>
  -		<i18n:if locale="ru">
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
  +
  +<document xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
  +          i18n:attr="language"
  +          language="language">
  +  <title>
  +    <i18n:text>titletext</i18n:text>
  +  </title>
  +
  +  <sub-title>
  +    <i18n:date-time pattern="FULL"/>
  +  </sub-title>
  +
  +  <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>
  +
  +  <content>
  +    <i18n:if locale="ru">
         <para title="ru" name="i18n:when">
  -				Этот текст отображается только для <strong>русского</strong> языка.
  -			</para>
  -		</i18n:if>
  -		<para title="first" name="article" i18n:attr="title name">
  -			<i18n:text i18n: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 i18n:key="Hello"/>
  -				<i18n:param>
  -					<strong><i18n:text>Kot</i18n:text></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>one</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" value="1703.74"/></i18n:param>
  -				<!--Old format: i18n:param type="currency" src-locale="en">27.24</i18n:param-->
  -				<i18n:param><i18n:number type="currency" src-locale="en" value="27.24"/></i18n:param>
  -				<i18n:param><i18n:number type="percent" src-locale="en" value="1.2"/></i18n:param>
  -				<i18n:param><i18n:date-time pattern="MEDIUM"/></i18n:param>
  -			</i18n:translate>
  -		</para>
  -	</content>
  -	<bottom>
  -		<copyright>
  -			<i18n:text>copyright</i18n:text>
  -		</copyright>
  -	</bottom>
  +        Этот текст отображается только для <strong>русского</strong> языка.
  +      </para>
  +    </i18n:if>
  +
  +    <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><i18n:text>Kot</i18n:text></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}.
  +        No{fifth}thing here.
  +        <i18n:param name="one"><i18n:text>one</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" value="1703.74"/></i18n:param>
  +        <!--Old format: i18n:param type="currency" src-locale="en">27.24</i18n:param-->
  +        <i18n:param><i18n:number type="currency" src-locale="en" value="27.24"/></i18n:param>
  +        <i18n:param><i18n:number type="percent" src-locale="en" value="1.2"/></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>
  
  
  
  1.8       +16 -0     cocoon-2.2/src/webapp/samples/i18n/menu.xml
  
  Index: menu.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/menu.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- menu.xml	12 May 2003 13:47:38 -0000	1.7
  +++ menu.xml	10 Mar 2004 10:20:25 -0000	1.8
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   <!--DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "dtd/book-cocoon-v10.dtd" -->
   
   <book software="Apache Cocoon" 
  @@ -14,6 +29,7 @@
       <menu-item label="Dynamic (XSP)" href="simple.xsp" i18n:attr="label"/>
       <menu-item label="Sitemap source" href="sitemap.xmap" i18n:attr="label"/>    
       <menu-item label="Multi catalogues" href="multi.xml" i18n:attr="label"/>
  +    <menu-item label="Tiered catalogues" href="tiered.xml" i18n:attr="label"/>
       <menu-item label="Back" href=".." i18n:attr="label"/>
     </menu>  
    
  
  
  
  1.3       +15 -0     cocoon-2.2/src/webapp/samples/i18n/multi.xml
  
  Index: multi.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/i18n/multi.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- multi.xml	10 May 2003 11:34:09 -0000	1.2
  +++ multi.xml	10 Mar 2004 10:20:25 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +  Copyright 1999-2004 The Apache Software Foundation
  +
  +  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.
  +-->
   <document xmlns:i18n="http://apache.org/cocoon/i18n/2.1" i18n:attr="language" language="language">
   	<title>
   		<i18n:text>titletext</i18n:text>
  
  
  
  1.1                  cocoon-2.2/src/webapp/samples/i18n/tiered.xml
  
  Index: tiered.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
    Copyright 1999-2004 The Apache Software Foundation
  
    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.
  -->
  
  <document xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
            i18n:attr="language"
            language="language">
    <title>
      <i18n:text>titletext</i18n:text>
    </title>
  
    <sub-title>
      <i18n:date-time pattern="FULL"/>
    </sub-title>
  
    <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>
  
    <content>
      <i18n:if locale="ru">
        <para title="ru" name="i18n:when">
          Этот текст отображается только для <strong>русского</strong> языка.
        </para>
      </i18n:if>
  
      <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><i18n:text>Kot</i18n:text></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}.
          No{fifth}thing here.
          <i18n:param name="one"><i18n:text>one</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" value="1703.74"/></i18n:param>
          <!--Old format: i18n:param type="currency" src-locale="en">27.24</i18n:param-->
          <i18n:param><i18n:number type="currency" src-locale="en" value="27.24"/></i18n:param>
          <i18n:param><i18n:number type="percent" src-locale="en" value="1.2"/></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>
  
  
  

Mime
View raw message