Author: crossley
Date: Tue Jun 20 00:10:10 2006
New Revision: 415532
URL: http://svn.apache.org/viewvc?rev=415532&view=rev
Log:
Improve demo of i18n and provide framework for other explanations and demos.
Issue: FOR-707
Added:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.de.xml
- copied, changed from r415497,
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.de.xml
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.fr.xml
- copied, changed from r415497,
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.fr.xml
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.nl.xml
- copied, changed from r415505,
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.nl.xml
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml
(with props)
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml
(with props)
Removed:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.de.xml
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.fr.xml
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.nl.xml
Modified:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.xml
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml
Modified:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.xml?rev=415532&r1=415531&r2=415532&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.xml
(original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.xml Tue
Jun 20 00:10:10 2006
@@ -45,18 +45,5 @@
<a href="site:plugins">plugins</a>,
these will often come with more samples for you to out.</p>
</section>
-
- <section id="i18n">
- <title>Internationalization</title>
- <p>
- As a simple example of Forrest's i18n functionality, you can view
- <a href="index.html?locale=fr">French</a> and <a
href="index.html?locale=de">German</a>
- versions of this page, using the <code>locale</code> request parameter
- to switch languages. There are other ways to switch, this is just one
way of
- demonstrating these features.
- </p>
- </section>
-
-
</body>
</document>
Copied:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.de.xml
(from r415497,
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.de.xml)
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.de.xml?p2=forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.de.xml&p1=forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.de.xml&r1=415497&r2=415532&rev=415532&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.de.xml
(original)
+++
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.de.xml
Tue Jun 20 00:10:10 2006
@@ -21,14 +21,12 @@
<title>Wilkommen zu "MyProj"</title>
</header>
<body>
- <!-- FIXME: my German probably needs some polishing -->
<section id="overview">
<title>Bravo!</title>
<p>Sie haben ein <a href="ext:forrest">Apache Forrest</a> basiertes
Projekt generiert. Diese Seite wird von einer xdocs konformen Datei
- <code>src/documentation/content/xdocs/index.de.xml</code> erstellt.
- Selbstverständlich können Sie es durch ihren persönlichen Inhalt
ersetzen.
- </p>
+ <code>src/documentation/content/xdocs/samples/demo-i18n.de.xml</code>
+ </p>
</section>
<section id="see-english">
@@ -39,7 +37,7 @@
</p>
<p>
Für mehr Informationen, konsultieren Sie bitte die
- <a href="site:index">Englische Version</a>.
+ <a href="site:i18n">i18n</a>.
</p>
</section>
Copied:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.fr.xml
(from r415497,
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.fr.xml)
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.fr.xml?p2=forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.fr.xml&p1=forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.fr.xml&r1=415497&r2=415532&rev=415532&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.fr.xml
(original)
+++
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.fr.xml
Tue Jun 20 00:10:10 2006
@@ -27,11 +27,10 @@
href="ext:forrest">Apache Forrest</a>.
Cette page provient du squelette de site fourni avec Forrest,
son contenu se trouve dans le fichier
- <code>src/documentation/content/xdocs/index.fr.xml</code>
- Vous pouvez bien entendu la modifier pour y mettre votre propre
contenu!
- </p>
+ <code>src/documentation/content/xdocs/samples/demo-i18n.fr.xml</code>
+ </p>
</section>
-
+
<section id="see-english">
<title>Traductions</title>
<p>
@@ -39,9 +38,8 @@
en français pour tester le mécanisme i18n.
</p>
<p>
- Pour plus d'infos, voir la <a href="site:index">version anglaise</a>.
+ Pour plus d'infos, voir la <a href="site:i18n">i18n</a>.
</p>
</section>
-
</body>
</document>
Copied:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.nl.xml
(from r415505,
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.nl.xml)
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.nl.xml?p2=forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.nl.xml&p1=forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.nl.xml&r1=415505&r2=415532&rev=415532&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.nl.xml
(original)
+++
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.nl.xml
Tue Jun 20 00:10:10 2006
@@ -26,38 +26,8 @@
<p>U hebt succesvol een <a
href="ext:forrest">Apache Forrest</a> site aangemaakt.
Deze pagina komt uit een site template. Dit template vind u in
- <code>src/documentation/content/xdocs/index.nl.xml</code>
- U kunt dit wijzigen en aanpassen met uw eigen teksten.</p>
- </section>
-
- <section id="examples">
- <title>Het gebruik van voorbeelden als templates</title>
- <p>
- Deze demo site kent veel voorbeelden. Kijk maar eens naar het menu aan
de
- linkerkant. De broncode van deze voorbeelden vind u in the map
- <code>src/documentation/content/xdocs/</code>
- </p>
- <p>
- De broncode voor de Apache Forrest website is ook bijgevoegd
- Deze vind u in <code>$FORREST_HOME/site-author/</code>
- </p>
- <p>De functionaliteit van Forrest kan worden uitgebreid met
- <a href="site:plugins">plugins</a>,
- deze komen vaak met veel voorbeelden om uit te proberen. </p>
- </section>
-
- <section id="i18n">
- <title>Internationalisatie</title>
- <p>
- Als een eenvoudig voorbeeld van Forrest's i18n functionaliteit, kun je
- <a href="index.html?locale=fr">Franse</a>, <a
href="index.html?locale=de">Duitse </a>
- of <a href="index.html?locale=nl">Nederlandse</a> versies van deze
pagina bekijken.
- Gebruik hierbij de <code>locale</code> parameter met de landencode om
van taal te wisselen.
- Er zijn meer manieren om van taal te wisselen, dit is er maar één
van dat deze functionaliteit
- demonstreert.
+ <code>src/documentation/content/xdocs/samples/demo-i18n.nl.xml</code>
</p>
</section>
-
-
</body>
</document>
Added:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml?rev=415532&view=auto
==============================================================================
---
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml
(added)
+++
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml
Tue Jun 20 00:10:10 2006
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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 document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
"http://forrest.apache.org/dtd/document-v20.dtd";>
+<document>
+ <header>
+ <title>Welcome to MyProj</title>
+ </header>
+ <body>
+ <section id="overview">
+ <title>Congratulations</title>
+ <p>You have successfully generated and rendered an <a
+ href="ext:forrest">Apache Forrest</a> site.
+ This page is from the site template. It is found in
+ <code>src/documentation/content/xdocs/samples/demo-i18n.xml</code>
+ </p>
+ </section>
+
+ <section id="see-english">
+ <title>Translations</title>
+ <p>
+ For more information, see the <a href="site:i18n">i18n</a>.
+ </p>
+ </section>
+ </body>
+</document>
Propchange:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml?rev=415532&view=auto
==============================================================================
---
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml
(added)
+++
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml
Tue Jun 20 00:10:10 2006
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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 document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
"http://forrest.apache.org/dtd/document-v20.dtd";>
+<document>
+ <header>
+ <title>Internationalisation (i18n)</title>
+ </header>
+ <body>
+ <section id="intro">
+ <title>Introduction</title>
+ <p></p>
+ </section>
+<fixme author="">
+This sample will explain and demonstrate the i18n capabilities.
+Issue <a href="http://issues.apache.org/jira/browse/FOR-707";>FOR-707</a> has
some discussion and doc links.
+We need to summarise it all into this demo.
+</fixme>
+
+ <section id="locale-request-param">
+ <title>Using the locale request parameter</title>
+ <p>
+ As a simple example of Forrest's i18n functionality, you can view
+ <a href="site:i18n-demo">this demo page</a>. To see alternative
language
+ versions of this page, append the <code>locale</code> request
parameter,
+ e.g. <code>localhost:8888/samples/demo-i18n.html?locale=fr</code>
+
+ </p>
+ <p>
+ There are some other laguage demos (de, fr, nl).
+ </p>
+ <p>This only works in 'forrest run' mode.
+ There are other ways to switch, this is just one way of
+ demonstrating these features.
+ </p>
+ </section>
+ </body>
+</document>
Propchange:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml?rev=415532&r1=415531&r2=415532&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml
(original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml Tue
Jun 20 00:10:10 2006
@@ -69,6 +69,8 @@
<svg label="Using SVG" href="svg.html" description="Using Scalable Vector
Graphics (SVG)"/>
<sample-usemap label="usemap" href="usemap.html" description="Client-side
imagemap"/>
+ <i18n label="Internationalisation (i18n)" href="i18n.html"/>
+ <i18n-demo label="i18n demonstration" href="demo-i18n.html"/>
<sample-custom label="Custom Schema" href="customSchema.html"
description="Custom XML schema and doctypes"/>
<custom-example href="custom.html" description="A custom XML file"/>
