You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/11/23 06:19:32 UTC

svn commit: r597553 - in /cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n: menu.xml multi.xml simple.xml simple.xsp simple2page.xsl sitemap.xmap tiered.xml translations/tiered/messages_ru.xml

Author: vgritsenko
Date: Thu Nov 22 21:19:31 2007
New Revision: 597553

URL: http://svn.apache.org/viewvc?rev=597553&view=rev
Log:
switch i18n samples from complex-page to simple-page

Removed:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/tiered.xml
Modified:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/multi.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple.xsp
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple2page.xsl
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/translations/tiered/messages_ru.xml

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml?rev=597553&r1=597552&r2=597553&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/menu.xml Thu Nov 22 21:19:31 2007
@@ -55,9 +55,9 @@
   </menu>
 
   <menu label="Documentation" i18n:attr="label">
-    <external label="i18n transformer docs" href="http://cocoon.apache.org/2.1/userdocs/i18nTransformer.html" i18n:attr="label"/>   
-    <external label="i18n transformer Javadoc" href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/transformation/I18nTransformer.html" i18n:attr="label"/>   
-    <external label="LocaleAction Javadoc" href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/acting/LocaleAction.html" i18n:attr="label"/>   
+    <menu-item label="i18n transformer docs" href="http://cocoon.apache.org/2.1/userdocs/i18nTransformer.html" i18n:attr="label"/>
+    <menu-item label="i18n transformer Javadoc" href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/transformation/I18nTransformer.html" i18n:attr="label"/>
+    <menu-item label="LocaleAction Javadoc" href="http://cocoon.apache.org/2.1/apidocs/org/apache/cocoon/acting/LocaleAction.html" i18n:attr="label"/>   
   </menu>
   
 </book>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/multi.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/multi.xml?rev=597553&r1=597552&r2=597553&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/multi.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/multi.xml Thu Nov 22 21:19:31 2007
@@ -15,15 +15,27 @@
   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">
+
+<page xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+          i18n:attr="language" language="language">
 	<title>
 		<i18n:text>titletext</i18n:text>
 	</title>
+
   <content>
     <para>
       This simple example shows how to use mulitple catalogues concurrently.
     </para>
-    <para>Here we take the key 'language' from the default (= messages) catalogue: <i18n:text>language</i18n:text>.</para>
-    <para>Here we take the key 'Documentation' from the menu catalogue: <i18n:text i18n:catalogue="menu">Documentation</i18n:text>.</para>
+
+    <para>
+      Here we take the key 'language' from the default (= messages) catalogue:
+      <i18n:text>language</i18n:text>.
+    </para>
+
+    <para>
+      Here we take the key 'Documentation' from the menu catalogue:
+      <i18n:text i18n:catalogue="menu">Documentation</i18n:text>.
+    </para>
   </content>
-</document>
+</page>
+        
\ No newline at end of file

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple.xml?rev=597553&r1=597552&r2=597553&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple.xml Thu Nov 22 21:19:31 2007
@@ -16,9 +16,10 @@
   limitations under the License.
 -->
 
-<document xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-          i18n:attr="language"
-          language="language">
+<page xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+      i18n:attr="language"
+      language="language">
+
   <title>
     <i18n:text>titletext</i18n:text>
   </title>
@@ -40,9 +41,11 @@
     <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"/>
@@ -51,6 +54,7 @@
         </i18n:param>
       </i18n:translate>
     </para>
+    
     <para title="forth" name="article" i18n:attr="title name">
       <i18n:translate>
         One = {one}, two = {two}, {third}!
@@ -62,6 +66,7 @@
         <i18n:param name="forth"> ~ </i18n:param>
       </i18n:translate>
     </para>
+
     <para title="Number formatting (not translated)" name="Article">
       <i18n:translate>
         Number: {0} | Currency: {1} | Percent: {2} | Processed on: {3}
@@ -85,7 +90,4 @@
     </i18n:if>
   </content>
 
-  <bottom>
-    <copyright>Copyright 1999-2005 The Apache Software Foundation</copyright>
-  </bottom>
-</document>
+</page>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple.xsp
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple.xsp?rev=597553&r1=597552&r2=597553&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple.xsp (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple.xsp Thu Nov 22 21:19:31 2007
@@ -25,22 +25,25 @@
     private static int count = 0;
   </xsp:logic>
 
-  <document i18n:attr="language" language="language">
+  <page 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"/>
@@ -49,6 +52,7 @@
         </i18n:param>
       </i18n:translate>
     </annotation>
+
     <sub-title>
       <i18n:translate>
         <i18n:text key="count_title"/>
@@ -75,7 +79,7 @@
           <i18n:text key="Hello"/>
           <i18n:param>
             <strong>
-              <xsp-request:get-parameter name="username" default="none" as="string" form-encoding="UTF-8"/>
+              <xsp-request:get-parameter name="username" default="Anonymous" as="string" form-encoding="UTF-8"/>
             </strong>
           </i18n:param>
         </i18n:translate>
@@ -113,16 +117,16 @@
         </i18n:translate>
       </para>
 
-      <!--
-        - Possibly bug in XSP: requires escaping of '\'
-        -->
-      <para title="Evaluated {first}, {second}, escaped \\{third\\}." name="i18n:expr" i18n:expr="title">
+      <para title="Evaluated {first}, {second}, escaped \{third\}." name="i18n:expr" i18n:expr="title">
         This paragraph is an example of attribute expression evaluation.
       </para>
+
+      <i18n:if locale="ru">
+        <para title="ru" name="i18n:if">
+          Этот текст отображается только для <strong>русского</strong> языка.
+        </para>
+      </i18n:if>
     </content>
 
-    <bottom>
-      <copyright>Copyright 1999-2005 The Apache Software Foundation</copyright>
-    </bottom>
-  </document>
+  </page>
 </xsp:page>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple2page.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple2page.xsl?rev=597553&r1=597552&r2=597553&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple2page.xsl (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/simple2page.xsl Thu Nov 22 21:19:31 2007
@@ -15,49 +15,37 @@
   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:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
   <xsl:param name="locale"/>
   <xsl:param name="page"/>
 
-  <xsl:template match="root">
-    <document>
-      <header>
-        <title>Internationalization (i18n) and Localization (l10n)</title>
-      </header>
-      <body>
+  <xsl:template match="composite">
+    <page>
+      <title>Internationalization (i18n) and Localization (l10n)</title>
+      <content>
         <row>
           <column title="Menu">
             <xsl:apply-templates select="book"/>
           </column>
-          <column title="{document/title}">
-            <xsl:apply-templates select="document"/>
+          <column title="{page/title}">
+            <xsl:apply-templates select="page"/>
           </column>
         </row>
-      </body>
-    </document>
+      </content>
+    </page>
   </xsl:template>
 
-  <xsl:template match="document">
-    <h2>
-      <font color="navy">
-        <xsl:value-of select="title"/>
-      </font>
-      <xsl:apply-templates select="form"/>
-    </h2>
-    <h5>
-      <xsl:value-of select="sub-title"/>
-    </h5>
-    <hr align="left" noshade="noshade" size="1"/>
-    <small>
-      <font color="red">
-        <i>
-          <xsl:apply-templates select="annotation"/>
-        </i>
-      </font>
-    </small>
+  <xsl:template match="page">
+    <h5><xsl:value-of select="sub-title"/></h5>
+    <xsl:apply-templates select="form"/>
+
     <xsl:apply-templates select="content"/>
+
     <hr align="left" noshade="noshade" size="1"/>
-    <xsl:apply-templates select="bottom"/>
+    <i><xsl:apply-templates select="annotation"/></i>
   </xsl:template>
 
   <xsl:template match="book">
@@ -66,14 +54,9 @@
 
   <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>
+      <b><xsl:number format="0. "/><xsl:value-of select="@name"/></b>
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="@title"/>
       <br/>
       <xsl:apply-templates select="text() | strong | i"/>
     </p>
@@ -85,12 +68,8 @@
       <img src="{@icon}" align="middle"/>
       <xsl:text> </xsl:text>
     </xsl:if>
-    <h3>
-      <xsl:value-of select="@label"/>
-    </h3>
-    <ul>
-      <xsl:apply-templates/>
-    </ul>
+    <h3><xsl:value-of select="@label"/></h3>
+    <ul><xsl:apply-templates/></ul>
   </xsl:template>
 
   <!-- Display a link to a page -->
@@ -104,22 +83,19 @@
     </li>
   </xsl:template>
 
-  <xsl:template match="menu-item | external">
+  <xsl:template match="menu-item">
     <li class="page">
       <xsl:if test="@icon">
         <img src="{@icon}" align="middle"/>
         <xsl:text> </xsl:text>
       </xsl:if>
-      <a href="{@href}" class="page">
-        <xsl:value-of select="@label"/>
-      </a>
+      <a href="{@href}" class="page"><xsl:value-of select="@label"/></a>
     </li>
   </xsl:template>
 
-  <xsl:template match="node()|@*" priority="-1">
+  <xsl:template match="@*|node()" priority="-1">
     <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates/>
+      <xsl:apply-templates select="@*|node()"/>
     </xsl:copy>
   </xsl:template>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap?rev=597553&r1=597552&r2=597553&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/sitemap.xmap Thu Nov 22 21:19:31 2007
@@ -27,21 +27,24 @@
 
   <map:components>
     <map:generators default="file">
-      <!--+
-        | Redefine generators to remove their labels (otherwise aggregated parts also go through views)
-        +-->
-      <map:generator name="file" logger="sitemap.generator.file" src="org.apache.cocoon.generation.FileGenerator" />
-      <map:generator name="serverpages" logger="sitemap.generator.serverpages" src="org.apache.cocoon.generation.ServerPagesGenerator" />
+      <!--
+        - Redefine generators to remove their labels (otherwise aggregated parts also go through views)
+        -->
+      <map:generator name="file"
+                     src="org.apache.cocoon.generation.FileGenerator"/>
+      <map:generator name="serverpages"
+                     src="org.apache.cocoon.generation.ServerPagesGenerator"/>
     </map:generators>
 
     <map:transformers default="xslt">
-      <!--+
-        | Configure i18n transformer with message catalogues
-        +-->
-      <map:transformer name="i18n" logger="sitemap.transformer.i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+      <!--
+        - Configure i18n transformer with message catalogues
+        -->
+      <map:transformer name="i18n"
+                       src="org.apache.cocoon.transformation.I18nTransformer">
         <catalogues default="messages">
-          <catalogue id="messages" name="messages" location="translations" />
-          <catalogue id="menu" name="menu" location="translations" />
+          <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>
@@ -51,28 +54,29 @@
     </map:transformers>
 
     <map:actions>
-      <!--+
-        | Locale action is used to set/get current user locale.
-        | See Javadocs for details.
-        +-->
-      <map:action name="locale" logger="sitemap.action.locale" src="org.apache.cocoon.acting.LocaleAction">
+      <!--
+        - Locale action is used to set/get current user locale.
+        - See Javadocs for details.
+        -->
+      <map:action name="locale"
+                  src="org.apache.cocoon.acting.LocaleAction">
         <!-- Creates a new session if needed. Used with 'store-in-session' param -->
         <create-session>true</create-session>
-        <!--+
-          | Stores locale information in session. A session should be created before,
-          | otherwise 'create-session' should be true.
-          +-->
+        <!--
+          - Stores locale information in session. A session should be created before,
+          - otherwise 'create-session' should be true.
+          -->
         <store-in-session>true</store-in-session>
         <!-- Stores locale information in request attributes -->
         <store-in-request>true</store-in-request>
         <!-- Stores locale information in a client cookie -->
         <store-in-cookie>false</store-in-cookie>
-        <!--+
-          | Uncomment to override default:
-          <locale-attribute>locale</locale-attribute>
-          <use-locale>true</use-locale>
-          <default-locale language="en" country="US"/>
-          +-->
+        <!--
+          - Uncomment to override defaults:
+        <locale-attribute>locale</locale-attribute>
+        <use-locale>true</use-locale>
+        <default-locale language="en" country="US"/>
+          -->
       </map:action>
     </map:actions>
   </map:components>
@@ -80,21 +84,21 @@
   <!-- =========================== Resources =============================== -->
 
   <map:resources>
-    <!--+
-      | This resource is used to create a composite page from menu and content
-      +-->
+    <!--
+      - This resource is used to create a composite page from menu and content
+      -->
     <map:resource name="composite">
-      <map:aggregate element="root">
-        <map:part src="cocoon:/menu/{../0}" />
-        <map:part src="cocoon:/content/{../0}" label="content" />
+      <map:aggregate element="composite">
+        <map:part src="cocoon:/menu/{../0}"/>
+        <map:part src="cocoon:/content/{../0}" label="content"/>
       </map:aggregate>
       <map:transform src="simple2page.xsl">
-        <map:parameter name="page" value="{../0}" />
-        <map:parameter name="locale" value="{../../locale}" />
+        <map:parameter name="page" value="{../0}"/>
+        <map:parameter name="locale" value="{../../locale}"/>
       </map:transform>
-      <map:transform src="servlet:style:/common/style/xsl/html/complex-page2html.xsl" />
-      <map:transform type="servletLinkRewriter" />
-      <map:serialize type="html" />
+      <map:transform src="servlet:style:/common/style/xsl/html/simple-page2html.xsl"/>
+      <map:transform type="servletLinkRewriter"/>
+      <map:serialize type="html"/>
     </map:resource>
   </map:resources>
 
@@ -120,85 +124,73 @@
 
   <map:pipelines>
     <map:pipeline>
+
       <!-- Default pipeline -->
       <map:match pattern="">
-        <map:redirect-to uri="simple.xml" />
+        <map:redirect-to uri="simple.xml"/>
       </map:match>
 
-      <map:act type="locale">
-        <!--+
-          | Locale aware content generation pipeline
-          +-->
+      <!--
+        - Locale aware content generation pipelines
+        -->
 
+      <map:act type="locale">
         <!-- Generate static output (simple.xml) -->
         <map:match pattern="*.xml">
-          <map:call resource="composite" />
+          <map:call resource="composite"/>
         </map:match>
 
         <!-- Generate dynamic output (simple.xsp) -->
         <map:match pattern="*.xsp">
-          <map:call resource="composite" />
+          <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:generate src="simple.xml"/>
           <map:transform type="i18n">
-            <map:parameter name="default-catalogue-id" value="tiered" />
-            <map:parameter name="locale" value="{../locale}" />
+            <map:parameter name="default-catalogue-id" value="tiered"/>
+            <map:parameter name="locale" value="{../locale}"/>
           </map:transform>
-          <map:serialize />
+          <map:serialize/>
         </map:match>
 
         <!-- A helper matcher for static content translation and generation -->
         <map:match pattern="content/*.xml">
-          <map:generate src="{1}.xml" />
+          <map:generate src="{1}.xml"/>
           <map:transform type="i18n">
-            <map:parameter name="locale" value="{../locale}" />
+            <map:parameter name="locale" value="{../locale}"/>
           </map:transform>
-          <map:serialize />
+          <map:serialize/>
         </map:match>
 
         <!-- A helper matcher for dynamic content translation and generation -->
         <map:match pattern="content/*.xsp">
-          <map:generate type="serverpages" src="{1}.xsp" />
+          <map:generate type="serverpages" src="{1}.xsp"/>
           <map:transform type="i18n">
-            <map:parameter name="locale" value="{../locale}" />
+            <map:parameter name="locale" value="{../locale}"/>
           </map:transform>
-          <map:serialize />
+          <map:serialize/>
         </map:match>
 
         <!-- Menu generation -->
         <map:match pattern="menu/*">
-          <map:generate src="menu.xml" />
+          <map:generate src="menu.xml"/>
           <map:transform type="i18n">
             <!-- Override default catalogue for this pipeline -->
-            <map:parameter name="default-catalogue-id" value="menu" />
-            <map:parameter name="locale" value="{../locale}" />
+            <map:parameter name="default-catalogue-id" value="menu"/>
+            <map:parameter name="locale" value="{../locale}"/>
           </map:transform>
-          <map:serialize />
+          <map:serialize/>
         </map:match>
       </map:act>
 
-      <!--+
-        | Locale agnostic pipeline part below
-        +-->
-
-      <!-- Display this sitemap source -->
-      <map:match pattern="sitemap.xmap">
-        <map:generate src="sitemap.xmap" />
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style:/service/system/xml2html" />
-        </map:serialize>
-      </map:match>
-
-      <map:match pattern="*.css">
-        <map:read src="{1}.css" mime-type="text/css" />
-      </map:match>
+      <!--
+        - Locale agnostic pipeline part below
+        -->
 
       <map:match pattern="images/*.gif">
-        <map:read src="images/{1}.gif" mime-type="image/gif" />
+        <map:read src="images/{1}.gif" mime-type="image/gif"/>
       </map:match>
 
     </map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/translations/tiered/messages_ru.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/translations/tiered/messages_ru.xml?rev=597553&r1=597552&r2=597553&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/translations/tiered/messages_ru.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/i18n/translations/tiered/messages_ru.xml Thu Nov 22 21:19:31 2007
@@ -16,12 +16,11 @@
   limitations under the License.
 -->
 
-<!--+
-    | Russian override message catalogue file for Cocoon 2 i18n sample
-    |
-    | CVS $Id$
-    +-->
-
+<!--
+  - Russian override message catalogue file for Cocoon 2 i18n sample
+  -
+  - $Id$
+  -->
 <catalogue xml:lang="ru">
     <message key="a_key">Это локально перекрытое значение по ключу.</message>
 </catalogue>