forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject svn commit: r190796 - in /forrest/trunk: main/fresh-site/forrest.properties main/webapp/sitemap.xmap site-author/status.xml
Date Wed, 15 Jun 2005 19:53:39 GMT
Author: cheche
Date: Wed Jun 15 12:53:39 2005
New Revision: 190796

URL: http://svn.apache.org/viewcvs?rev=190796&view=rev
Log:
Add a config selector so the i18n transformer only works whrn i18n is true

Modified:
    forrest/trunk/main/fresh-site/forrest.properties
    forrest/trunk/main/webapp/sitemap.xmap
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/main/fresh-site/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/forrest.properties?rev=190796&r1=190795&r2=190796&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/forrest.properties (original)
+++ forrest/trunk/main/fresh-site/forrest.properties Wed Jun 15 12:53:39 2005
@@ -109,8 +109,9 @@
 # The issues list as rss
 #project.issues-rss-url=
 
-#I18n Property. If you want to use it for static site then make sure that
-# you have $LANG set on your enviroment
+#I18n Property. Based on the locale request for the browser.
+#If you want to use it for static site then modify the JVM system.language
+# and run once per language
 #project.i18n=true
 
 # The names of plugins that are required to build the project

Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?rev=190796&r1=190795&r2=190796&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Wed Jun 15 12:53:39 2005
@@ -130,7 +130,7 @@
    </map:transformer>
    <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
     <catalogues default="common">
-      <catalogue id="common" name="CommonMessages" location="skins/common/messages"/>
+      <catalogue id="common" name="CommonMessages" location="skins/common/translations"/>
     </catalogues>
     <cache-at-startup>true</cache-at-startup>
   </map:transformer>
@@ -179,12 +179,15 @@
     </map:matchers>
 
     <map:selectors>
-      <map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.forrest.sourceexists.SourceExistsSelector"
/>
-   <map:selector logger="sitemap.selector.exception" name="exception"
-                 src="org.apache.cocoon.selection.ExceptionSelector">
-     <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException"/>
-     <exception class="java.lang.Throwable" unroll="true"/>
-   </map:selector>
+      <map:selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+      <map:selector name="exception" logger="sitemap.selector.exception" 
+                    src="org.apache.cocoon.selection.ExceptionSelector">
+       <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException"/>
+       <exception class="java.lang.Throwable" unroll="true"/>
+     </map:selector>
+     <map:selector name="config" logger="sitemap.selector.config" 
+                   src="org.apache.cocoon.selection.SimpleSelector" />
     </map:selectors>
 
     <map:pipes default="caching">
@@ -233,9 +236,14 @@
             </map:transform>
           </map:otherwise>
         </map:select>
-        <map:transform type="i18n">
-          <map:parameter name="locale" value="{request:locale}"/>
-        </map:transform>
+        <map:select type="config">
+          <map:parameter name="value" value="{defaults:i18n}"/>
+          <map:when test="true">	
+            <map:transform type="i18n">
+              <map:parameter name="locale" value="{request:locale}"/>
+            </map:transform>
+	  </map:when>
+        </map:select>
       <!--
         FIXME: strip_namespace is because this bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=35348
       -->

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/status.xml?rev=190796&r1=190795&r2=190796&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Wed Jun 15 12:53:39 2005
@@ -55,7 +55,8 @@
   <changes>
     <release version="0.8-dev" date="not yet released">
       <notes>
-        <p>Apache Forrest is pleased to release the new version: apache-forrest-0.7</p>
+        <section>
+        <title>Apache Forrest is pleased to release the new version: apache-forrest-0.7</title>
         
         <p>It can be downloaded from one of the <link href="http://forrest.apache.org/mirrors.cgi">Apache
         Software Foundation mirror sites</link>.</p>
@@ -67,7 +68,7 @@
         standards, which separates presentation from content.
         Forrest can generate static documents, or be used as a
         dynamic server, or be deployed by its automated facility.</p>
-        
+        </section>
         <section>
           <title>Requirements</title>
 
@@ -121,7 +122,6 @@
           <p>Feedback, feature suggestions, bugs and any other issues can be discussed
on
           our <link href="http://forrest.apache.org/mail-lists.html">mailing lists</link>.</p>
         </section>
-        
       </notes>
       
     </release>
@@ -131,6 +131,10 @@
         Added document to facilitate
         <link href="site:v0.70//upgrading_07">upgrading to v0.7</link>
       </action>
+      <action context="code" type="update" dev="JJP"fixes-bug="FOR-18">
+          Config check for the i8n attribute for i18n transformer
+	  so it used only when necesary.
+       </action>
       <action dev="DC" type="update" context="code" importance="high">
         Enhanced the Message of the Day (MOTD) facility.
         See skinconf.xml from a "seed" site for configuration details.



Mime
View raw message