Author: milamber
Date: Sun Mar 8 12:08:35 2015
New Revision: 1664981
URL: http://svn.apache.org/r1664981
Log:
Fix the fix for localising page.
Bugzilla Id: 53764
Modified:
jmeter/trunk/build.xml
jmeter/trunk/docs/localising/index.html
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1664981&r1=1664980&r2=1664981&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Mar 8 12:08:35 2015
@@ -2297,8 +2297,7 @@ run JMeter unless all the JMeter jars ar
<mkdir dir="${dest.docs}" />
<!-- The extending pages are rather out of date (and not linked from
elsewhere) -->
<xslt style="xdocs/stylesheets/website-style.xsl" basedir="${src.docs}"
destdir="${dest.docs}"
- excludes="**/stylesheets/** extending.xml extending/*.xml"
- includes="**/*.xml">
+ excludes="extending.xml" includes="*.xml">
<param name="relative-path" expression="." />
<param name="subdir" expression="" />
<param name="year" expression="${year}" />
@@ -2308,6 +2307,12 @@ run JMeter unless all the JMeter jars ar
<param name="relative-path" expression=".." />
<param name="subdir" expression="usermanual" />
<param name="year" expression="${year}" />
+ </xslt>
+ <xslt style="xdocs/stylesheets/website-style.xsl"
basedir="${src.docs}/localising" destdir="${dest.docs}/localising"
+ includes="*.xml">
+ <param name="relative-path" expression=".." />
+ <param name="subdir" expression="usermanual" />
+ <param name="year" expression="${year}" />
</xslt>
<copy todir="${dest.docs}/images">
<fileset dir="${src.images}" excludes="logo.xcf,logo.svg"/>
Modified: jmeter/trunk/docs/localising/index.html
URL:
http://svn.apache.org/viewvc/jmeter/trunk/docs/localising/index.html?rev=1664981&r1=1664980&r2=1664981&view=diff
==============================================================================
--- jmeter/trunk/docs/localising/index.html (original)
+++ jmeter/trunk/docs/localising/index.html Sun Mar 8 12:08:35 2015
@@ -1,11 +1,11 @@
<!DOCTYPE html SYSTEM "about:legacy-compat">
<html lang="en"><head><META http-equiv="Content-Type" content="text/html;
charset=iso-8859-15"><title>Apache JMeter
-
- JMeter Localisation (Translator's Guide)</title><meta name="author"
value="Jordi Salvat i Alabart"><meta name="email"
value="[email protected]"><meta name="viewport" content="width=device-width,
initial-scale=1"><link
href="http://fonts.googleapis.com/css?family=Merriweather:400normal";
rel="stylesheet" type="text/css"><link rel="stylesheet" type="text/css"
href="./css/new-style.css"></head><body role="document"><a href="#content"
class="hidden">Main content</a><div class="header"><!--
+ JMeter Localisation (Translator's Guide)</title><meta name="author"
value="Jordi Salvat i Alabart"><meta name="email"
value="[email protected]"><meta name="viewport" content="width=device-width,
initial-scale=1"><link
href="http://fonts.googleapis.com/css?family=Merriweather:400normal";
rel="stylesheet" type="text/css"><link rel="stylesheet" type="text/css"
href="../css/new-style.css"></head><body role="document"><a href="#content"
class="hidden">Main content</a><div class="header"><!--
APACHE LOGO
- --><div><a href="http://www.apache.org";><img title="Apache Software
Foundation" width="290" height="75" src="./images/asf-logo.png" alt="Logo
ASF"></a></div><!--
+ --><div><a href="http://www.apache.org";><img title="Apache Software
Foundation" width="290" height="75" src="../images/asf-logo.png" alt="Logo
ASF"></a></div><!--
PROJECT LOGO
- --><div><a href="http://jmeter.apache.org/";><img
src="./images/logo.jpg" alt="Apache JMeter"></a></div><div
class="twitter"><div><a href="https://twitter.com/share";
class="twitter-share-button" data-text="Powerful Load Testing with Apache
#JMeter" data-via="ApacheJMeter" data-lang="en-gb"
data-size="large">Tweet</a><script>
+ --><div><a href="http://jmeter.apache.org/";><img
src="../images/logo.jpg" alt="Apache JMeter"></a></div><div
class="twitter"><div><a href="https://twitter.com/share";
class="twitter-share-button" data-text="Powerful Load Testing with Apache
#JMeter" data-via="ApacheJMeter" data-lang="en-gb"
data-size="large">Tweet</a><script>
(function(d,s,id){
var js,
fjs=d.getElementsByTagName(s)[0],
@@ -28,7 +28,7 @@
fjs.parentNode.insertBefore(js,fjs);
}
})(document, 'script', 'twitter-wjs');
- </script></div></div><div class="banner"><iframe
src="http://www.apache.org/ads/bannerbar.html"; style="border-width:0;"
frameborder="0" scrolling="no"></iframe><div
class="clear"></div></div></div><div class="nav"><ul class="menu"><li><div
class="menu-title">About</div><ul><li><a
href="./index.html">Overview</a></li><li><a
href="http://twitter.com/ApacheJMeter";>JMeter on Twitter<img
src="./images/twitter.png" alt="Icon for JMeter on Twitter"></a></li><li><a
href="./issues.html">Issue Tracking</a></li><li><a
href="http://projects.apache.org/feeds/rss/jmeter.xml";>Subscribe to What's
New</a></li><li><a
href="http://www.apache.org/licenses/";>License</a></li></ul></li></ul><ul
class="menu"><li><div class="menu-title">Download</div><ul><li><a
href="./download_jmeter.cgi">Download Releases</a></li><li><a
href="./nightly.html">Developer (Nightly) Builds</a></li></ul></li></ul><ul
class="menu"><li><div class="menu-title">Documentation</div><ul><li><a
href="./changes.html">Chang
es per version</a></li><li><a href="./usermanual/get-started.html">Get
Started</a></li><li><a href="./usermanual/index.html">User
Manual</a></li><li><a href="./usermanual/best-practices.html">Best
Practices</a></li><li><a href="./usermanual/component_reference.html">Component
Reference</a></li><li><a href="./usermanual/functions.html">Functions
Reference</a></li><li><a href="./api/index.html">Javadocs</a></li><li><a
href="./localising/index.html">Localisation (Translator's Guide)</a></li><li><a
href="./building.html">Building JMeter and Add-Ons</a></li><li><a
href="http://wiki.apache.org/jmeter";>JMeter Wiki</a></li><li><a
href="http://wiki.apache.org/jmeter/JMeterFAQ";>FAQ
(Wiki)</a></li></ul></li></ul><ul class="menu"><li><div
class="menu-title">Tutorials (PDF format)</div><ul><li><a
href="./usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed
Testing</a></li><li><a
href="./usermanual/jmeter_proxy_step_by_step.pdf">Recording
Tests</a></li><li><a href="./usermanual/jun
itsampler_tutorial.pdf">JUnit Sampler</a></li><li><a
href="./usermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log
Sampler</a></li><li><a href="./extending/jmeter_tutorial.pdf">Extending
JMeter</a></li></ul></li></ul><ul class="menu"><li><div
class="menu-title">Community</div><ul><li><a
href="http://wiki.apache.org/jmeter/JMeterCommitters";>Contributors</a></li><li><a
href="./mail.html">Mailing Lists</a></li><li><a href="./svnindex.html">SVN
Repositories</a></li></ul></li></ul><ul class="menu"><li><div
class="menu-title">Foundation</div><ul><li><a
href="http://www.apache.org/";>ASF</a></li><li><a
href="http://www.apache.org/foundation/getinvolved.html";>Get Involved in the
ASF</a></li><li><a
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li></ul></li></ul></div><div
class="main" id="content"><div class="section"><h1 id="intro">Introduction<a
class="sectionlink" href="#intro"
title="Link to here">¶</a></h1>
+ </script></div></div><div class="banner"><iframe
src="http://www.apache.org/ads/bannerbar.html"; style="border-width:0;"
frameborder="0" scrolling="no"></iframe><div
class="clear"></div></div></div><div class="nav"><ul class="menu"><li><div
class="menu-title">About</div><ul><li><a
href="../index.html">Overview</a></li><li><a
href="http://twitter.com/ApacheJMeter";>JMeter on Twitter<img
src="../images/twitter.png" alt="Icon for JMeter on Twitter"></a></li><li><a
href="../issues.html">Issue Tracking</a></li><li><a
href="http://projects.apache.org/feeds/rss/jmeter.xml";>Subscribe to What's
New</a></li><li><a
href="http://www.apache.org/licenses/";>License</a></li></ul></li></ul><ul
class="menu"><li><div class="menu-title">Download</div><ul><li><a
href="../download_jmeter.cgi">Download Releases</a></li><li><a
href="../nightly.html">Developer (Nightly) Builds</a></li></ul></li></ul><ul
class="menu"><li><div class="menu-title">Documentation</div><ul><li><a
href="../changes.html"
>Changes per version</a></li><li><a href="../usermanual/get-started.html">Get
>Started</a></li><li><a href="../usermanual/index.html">User
>Manual</a></li><li><a href="../usermanual/best-practices.html">Best
>Practices</a></li><li><a
>href="../usermanual/component_reference.html">Component
>Reference</a></li><li><a href="../usermanual/functions.html">Functions
>Reference</a></li><li><a href="../api/index.html">Javadocs</a></li><li><a
>href="../building.html">Building JMeter and Add-Ons</a></li><li><a
>href="http://wiki.apache.org/jmeter";>JMeter Wiki</a></li><li><a
>href="http://wiki.apache.org/jmeter/JMeterFAQ";>FAQ
>(Wiki)</a></li></ul></li></ul><ul class="menu"><li><div
>class="menu-title">Tutorials (PDF format)</div><ul><li><a
>href="../usermanual/jmeter_distributed_testing_step_by_step.pdf">Distributed
>Testing</a></li><li><a
>href="../usermanual/jmeter_proxy_step_by_step.pdf">Recording
>Tests</a></li><li><a href="../usermanual/junitsampler_tutorial.pdf">JUnit
>Sampler</a></li><li><a href="../us
ermanual/jmeter_accesslog_sampler_step_by_step.pdf">Access Log
Sampler</a></li><li><a href="../extending/jmeter_tutorial.pdf">Extending
JMeter</a></li></ul></li></ul><ul class="menu"><li><div
class="menu-title">Community</div><ul><li><a
href="http://wiki.apache.org/jmeter/JMeterCommitters";>Contributors</a></li><li><a
href="../mail.html">Mailing Lists</a></li><li><a href="../svnindex.html">SVN
Repositories</a></li></ul></li></ul><ul class="menu"><li><div
class="menu-title">Foundation</div><ul><li><a
href="http://www.apache.org/";>ASF</a></li><li><a
href="http://www.apache.org/foundation/getinvolved.html";>Get Involved in the
ASF</a></li><li><a
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li></ul></li></ul></div><div
class="main" id="content"><div class="section"><h1 id="intro">Introduction<a
class="sectionlink" href="#intro" title="Link to here">¶</a></h1>
<p>This document describes the process of creating and maintaining translated
texts for JMeter in languages
other than English. English has been tacitly chosen as the project's primary
(or "default") language -- despite its
@@ -40,6 +40,7 @@ provinces. The process of producing and
<p>This document assumes you'll be using i18nEdit as your tool to edit
properties files, and instructions will
be specific to this software, but this is not mandatory: the process should
mostly work also if you prefer to use
another tool, such as or <b>vi</b> or <b>Emacs</b>.
+</p>
<p>This document describes 6 processes:</p>
<ol>
@@ -50,7 +51,6 @@ another tool, such as or <b>vi</b> or <b
<li>Submitting your translations to the project [translators].</li>
<li>Merging in new translations [committers].</li>
</ol>
-</p>
</div><div class="section"><h1 id="obtain">Obtaining the current texts<a
class="sectionlink" href="#obtain" title="Link to here">¶</a></h1>
@@ -71,10 +71,12 @@ you'll need to know where it is to start
</div><div class="section"><h1 id="provide">Providing the current texts to
translators<a class="sectionlink" href="#provide" title="Link to
here">¶</a></h1>
<p>If you have access to JMeter's SVN repository and you want to pack the
files necessary for localisation
-for sending to a translator, just go to the directory above the project root
and issue the following command:<br>
-<span class="code">
+for sending to a translator, just go to the directory above the project root
and issue the following command:
+</p>
+<pre class="source">
tar czf jmeter-localisation.tgz `find jmeter/src -name "*.properties" -o -name
"*.metaprops"`
-</span>
+</pre>
+<p>
Of course you could also send the translator the whole jmeter directory, but
this will make his life easier.
</p>
@@ -84,12 +86,12 @@ Of course you could also send the transl
<a
href="http://www.cantamen.com/i18nedit.php";>http://www.cantamen.com/i18nedit.php</a>.
Download the binary distribution (i18nedit-1.0.0.jar) and save it locally.</p>
<p>To run i18nEdit, just make sure to have a reasonably modern Java Runtime
Environment in your PATH, change
-to the directory where you saved i18nedit-1.0.0.jar, then issue the following
command:<br>
-<span class="code">
+to the directory where you saved i18nedit-1.0.0.jar, then issue the following
command:</p>
+<pre class="source">
java -jar i18nedit-1.0.0.jar
-</span>
-</p>
-<p>Then:
+</pre>
+
+Then:
<ol>
<li>If you've never run i18nEdit before, choose a language. The rest of this
document assumes you chose UK English.</li>
<li>Select the "Projects" menu, then "Open project...".</li>
@@ -98,7 +100,6 @@ java -jar i18nedit-1.0.0.jar
appears in the list in field "Additional locales (ISO codes)". Otherwise, add
it now. Press "Save".</li>
</ol>
You're now ready to start translating.
-</p>
</div><div class="section"><h1 id="translating">Translating<a
class="sectionlink" href="#translating" title="Link to here">¶</a></h1>
@@ -121,7 +122,7 @@ tgz, or alike and attach them to a JMete
</div><div class="section"><h1 id="merging">Merging in new translations<a
class="sectionlink" href="#merging" title="Link to here">¶</a></h1>
-<p>If you're a committer receiving text files from a translator, follow this
steps to merge them into
+If you're a committer receiving text files from a translator, follow this
steps to merge them into
the project:
<ol>
<li>Unpack the files submitted by the translator in a separate directory.</li>
@@ -133,7 +134,6 @@ the project:
<li>Press "Perform merge".</li>
<li>Close i18nEdit and commit to SVN as usual (remember to Refresh your
project if you're using Eclipse).</li>
</ol>
-</p>
</div></div><div class="footer"><div class="copyright">
Copyright ©
