[Maposmatic-dev] [PATCH 2/5] Unwrap text blocks to ease translation

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <address@hidden>
---
 www/templates/maposmatic/about.html  |    2 +-
 www/templates/maposmatic/base.html   |    4 +--
 www/templates/maposmatic/donate.html |   35 +++++----------------------------
 www/templates/maposmatic/index.html  |   23 ++++-----------------
 www/templates/maposmatic/new.html    |    2 +-
 5 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/www/templates/maposmatic/about.html 
b/www/templates/maposmatic/about.html
index bea52aa..52902aa 100644
--- a/www/templates/maposmatic/about.html
+++ b/www/templates/maposmatic/about.html
@@ -189,7 +189,7 @@ us:{% endblocktrans %}
       <li>Jeroen van Rijn ({% trans "dutch translation" %})</li>
       <li>Marjan Vrban ({% trans "croatian translation" %})</li>
       <li>Łukasz Jernaś ({%trans "polish translation" %})</li>
-      <li>Sylvain Collilieux ({%trans "B&W stylesheet" %})</li>
+      <li>Sylvain Collilieux ({%trans "printable stylesheet" %})</li>
     </ul>
   </td>
 </tr></tbody></table>
diff --git a/www/templates/maposmatic/base.html 
b/www/templates/maposmatic/base.html
index 13bdbd9..dd7c71e 100644
--- a/www/templates/maposmatic/base.html
+++ b/www/templates/maposmatic/base.html
@@ -98,9 +98,7 @@
            <img alt="" border="0" 
src="https://www.paypalobjects.com/{{paypal_lang_code}}/i/scr/pixel.gif"; 
width="1" height="1"/>
          </form>
 
-         <p>{% blocktrans %}You can donate to help us improve the
-         service. See our <a href="/donate">donation</a> page.
-           {% endblocktrans %}</p>
+         <p>{% blocktrans %}You can donate to help us improve the service. See 
our <a href="/donate">donation</a> page.{% endblocktrans %}</p>
 
        </div>
 
diff --git a/www/templates/maposmatic/donate.html 
b/www/templates/maposmatic/donate.html
index 53d50ef..995e9cf 100644
--- a/www/templates/maposmatic/donate.html
+++ b/www/templates/maposmatic/donate.html
@@ -32,43 +32,20 @@ class="activelink"
 
 {% url about as about_url %}
 
-<p>{%blocktrans%}MapOSMatic is a project entirely developed and
-maintained by a team of volunteers (see
-our <a href="{{about_url}}">About</a> page for details). However,
-running the MapOSMatic service and making improvements to it have
-various costs beyond the time of the volunteer
-developers.{%endblocktrans%}</p>
+<p>{%blocktrans%}MapOSMatic is a project entirely developed and maintained by 
a team of volunteers (see our <a href="{{about_url}}">About</a> page for 
details). However, running the MapOSMatic service and making improvements to it 
have various costs beyond the time of the volunteer 
developers.{%endblocktrans%}</p>
 
-<p>{%blocktrans%}Therefore, we are currently seeking donations to help
-us funding:{%endblocktrans%}</p>
+<p>{%blocktrans%}Therefore, we are currently seeking donations to help us 
funding:{%endblocktrans%}</p>
 
 <ul>
-  <li>{%blocktrans%}Acquisition of a Solid-State Disk for the storage
-  of our local copy of the OpenStreetMap database. A SSD drive
-  performs 40 to 50 times better than the conventional hard drive we
-  are using today, and would therefore help us to reduce the lag
-  between our local database and the official one, providing more
-  up-to-date maps. The cost of such hardware is about 500 to 700
-  €.{%endblocktrans%}</li>
-
-  <li>{%blocktrans%}Participation to the transportation expenses of
-  the MapOSMatic developers when they gather for <i>hackfests</i>
-  (meeting of developers). You can read
-  our <a href="http://news.maposmatic.org";>blog</a> to learn more
-  about what we achieve during those hackfests. We usually implement a
-  huge number of improvements, new features and bug fixes during those
-  meetings. They take place during the holidays of the developers, and
-  we would like to at least compensate their travel
-  expenses.{%endblocktrans%}</li>
+  <li>{%blocktrans%}Acquisition of a Solid-State Disk for the storage of our 
local copy of the OpenStreetMap database. A SSD drive performs 40 to 50 times 
better than the conventional hard drive we are using today, and would therefore 
help us to reduce the lag between our local database and the official one, 
providing more up-to-date maps. The cost of such hardware is about 500 to 700 
€.{%endblocktrans%}</li>
+
+  <li>{%blocktrans%}Participation to the transportation expenses of the 
MapOSMatic developers when they gather for <i>hackfests</i> (meeting of 
developers). You can read our <a href="http://news.maposmatic.org";>blog</a> to 
learn more about what we achieve during those hackfests. We usually implement a 
huge number of improvements, new features and bug fixes during those meetings. 
They take place during the holidays of the developers, and we would like to at 
least compensate their travel expenses.{%endblocktrans%}</li>
 
 </ul>
 
 <h2>{% trans "Donating?" %}</h2>
 
-<p>{%blocktrans%}Donations can be done through the
-well-known <a href="http://www.paypal.com";>PayPal</a> service. We
-accept donations of any amount: all donations are
-helpful, even the smallest ones.{%endblocktrans%}</p>
+<p>{%blocktrans%}Donations can be done through the well-known <a 
href="http://www.paypal.com";>PayPal</a> service. We accept donations of any 
amount: all donations are helpful, even the smallest ones.{%endblocktrans%}</p>
 
 <form action="https://www.paypal.com/cgi-bin/webscr"; method="post">
   <input type="hidden" name="cmd" value="_s-xclick"/>
diff --git a/www/templates/maposmatic/index.html 
b/www/templates/maposmatic/index.html
index 887e322..79e088c 100644
--- a/www/templates/maposmatic/index.html
+++ b/www/templates/maposmatic/index.html
@@ -39,34 +39,21 @@
 </div>
 
 <p>
-{% blocktrans %}MapOSMatic is a free software web service that
-allows you to generate maps of cities using
-<a href="http://www.openstreetmap.org";>OpenStreetMap</a>
-data. MapOSMatic can generate two kinds of maps: :{% endblocktrans %}
+{% blocktrans %}MapOSMatic is a free software web service that allows you to 
generate maps of cities using <a 
href="http://www.openstreetmap.org";>OpenStreetMap</a> data. MapOSMatic can 
generate two kinds of maps: :{% endblocktrans %}
 </p>
 
 <ul>
-  <li>{% blocktrans %}Single page posters, where the map and the
-  street index are rendered side by side. The map itself is split in
-  squares so that streets are easy to find. This format is typically
-  useful for printing on large paper sheets.{% endblocktrans %}</li>
+  <li>{% blocktrans %}Single page posters, where the map and the street index 
are rendered side by side. The map itself is split in squares so that streets 
are easy to find. This format is typically useful for printing on large paper 
sheets.{% endblocktrans %}</li>
 
-  <li>{% blocktrans %}Multiple page booklets, where the map and the
-  street index are split into several pages. This format is typically
-  useful for printing on standard paper sheets.{% endblocktrans %}</li>
+  <li>{% blocktrans %}Multiple page booklets, where the map and the street 
index are split into several pages. This format is typically useful for 
printing on standard paper sheets.{% endblocktrans %}</li>
 </ul>
 
 <p>
-{% blocktrans %}The generated maps are available in PNG, PDF and
-SVG formats and are ready to be printed.{% endblocktrans %}
+{% blocktrans %}The generated maps are available in PNG, PDF and SVG formats 
and are ready to be printed.{% endblocktrans %}
 </p>
 
 <p>
-{% blocktrans %}As the data used to generate maps is coming from
-OpenStreetMap, you can freely (under the <a
-href="http://wiki.openstreetmap.org/wiki/License";>terms of
-OpenStreetMap license</a>) reuse, sell, modify, ... the generated
-maps.{% endblocktrans %}
+{% blocktrans %}As the data used to generate maps is coming from 
OpenStreetMap, you can freely (under the <a 
href="http://wiki.openstreetmap.org/wiki/License";>terms of OpenStreetMap 
license</a>) reuse, sell, modify, ... the generated maps.{% endblocktrans %}
 </p>
 
 <div id="more">
diff --git a/www/templates/maposmatic/new.html 
b/www/templates/maposmatic/new.html
index 61410a0..8cf9a8d 100644
--- a/www/templates/maposmatic/new.html
+++ b/www/templates/maposmatic/new.html
@@ -110,7 +110,7 @@
       {{ form.administrative_osmid.errors }}
       {{ form.administrative_city.errors }}
       <span id="noresultsinfo">{% trans "No results." %}</span>
-      <span id="noadminboundary">{% trans "Wondering why you can't choose some 
of these results?<br />Their administrative boundaries are missing from the OSM 
database.<br />Look at the <a 
href=\"http://wiki.maposmatic.org/doku.php?id=faq\";>FAQ</a> for more details." 
%}</span>
+      <span id="noadminboundary">{% blocktrans %}Wondering why you can't 
choose some of these results?<br />Their administrative boundaries are missing 
from the OSM database.<br />Look at the <a 
href="http://wiki.maposmatic.org/doku.php?id=faq";>FAQ</a> for more details.{% 
endblocktrans %}</span>
     </div>
   </div>
 
-- 
1.7.4.1