templates: Fix translation of multiline strings

TT doesn't care about adding random whitespace in multiline
strings. This breaks gettext of course.

Reported by Kobayashi Noritada <nori1 -at- dolphin c u-tokyo ac jp>

diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index 360d0cfc5cc2c4a6961c42c320881297de0de1ac..5af883d5f7decc8308d0d933b912d406a0acdc8d 100644 (file)
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -20,13 +20,9 @@
 [% END %]
 
 <div class="pconstantnag">
 [% END %]
 
 <div class="pconstantnag">

-<p>[% g('If you are running %s, it is strongly suggested to use a
-package manager like <a href="%s">aptitude</a> or
-<a href="%s">synaptic</a> to download and install
-packages, instead of doing so manually via this website.',
+<p>[% g('If you are running %s, it is strongly suggested to use a package manager like <a href="%s">aptitude</a> or <a href="%s">synaptic</a> to download and install packages, instead of doing so manually via this website.',

        organisation, make_url('aptitude','','arch',''), make_url('synaptic','','arch','')) %]</p>
        organisation, make_url('aptitude','','arch',''), make_url('synaptic','','arch','')) %]</p>

-<p>[% g('You should be able to use any of the listed mirrors by adding a
-line to your <kbd>/etc/apt/sources.list</kbd> like this:') %]</p>
+<p>[% g('You should be able to use any of the listed mirrors by adding a line to your <kbd>/etc/apt/sources.list</kbd> like this:') %]</p>

 [% IF archive != "security" %]
 <pre>
 deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section IF section != main_section %]
 [% IF archive != "security" %]
 <pre>
 deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section IF section != main_section %]


@@ -39,16 +35,11 @@ deb http://security.debian.org/debian-security [% suite _ "/updates" %] main [%
 [%- END %]
 [% IF suite == "experimental" %]
 <h2>[% g('Experimental package') %]</h2>
 [%- END %]
 [% IF suite == "experimental" %]
 <h2>[% g('Experimental package') %]</h2>

-<p>[% g('Warning: This package is from the <strong>experimental</strong> distribution.
-That means it is likely unstable or buggy, and it may even cause data loss.
-Please be sure to consult the changelog and other possible documentation before
-using it.') %]</p>
+<p>[% g('Warning: This package is from the <strong>experimental</strong> distribution. That means it is likely unstable or buggy, and it may even cause data loss. Please be sure to consult the changelog and other possible documentation before using it.') %]</p>

 [% END %]
 [% IF subsection == "debian-installer" %]
 <h2>[% g('debian-installer udeb package') %]</h2>
 [% END %]
 [% IF subsection == "debian-installer" %]
 <h2>[% g('debian-installer udeb package') %]</h2>

-<p>[% g('Warning: This package is intended for the use in building
-<a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only.
-Do not install it on a normal %s system.', organisation) %]</p>
+<p>[% g('Warning: This package is intended for the use in building <a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only. Do not install it on a normal %s system.', organisation) %]</p>

 [% END %]
 </div>
 
 [% END %]
 </div>
 


@@ -89,8 +80,7 @@ Do not install it on a normal %s system.', organisation) %]</p>
 <div id="pdownloadnotes">
 
 [% IF a.mirror_list %]
 <div id="pdownloadnotes">
 
 [% IF a.mirror_list %]

-<p style="clear:both">[% g('If none of the above sites are fast enough for you,
-please see our <a href="%s">complete mirror list</a>.', a.mirror_list ) %]</p>
+<p style="clear:both">[% g('If none of the above sites are fast enough for you, please see our <a href="%s">complete mirror list</a>.', a.mirror_list ) %]</p>

 [% END %]
 
 [% IF a.unofficial_port %]
 [% END %]
 
 [% IF a.unofficial_port %]


@@ -98,14 +88,11 @@ please see our <a href="%s">complete mirror list</a>.', a.mirror_list ) %]</p>
 [% IF port.url_name;
    SET port.url = ports_url _ port.url_name _ '/';
    END -%]
 [% IF port.url_name;
    SET port.url = ports_url _ port.url_name _ '/';
    END -%]

-<p style="clear:both">[% g('Note that %s is not officially included in the %s archive yet,
-but the %s porter group keeps their archive in sync with the official archive as close as possible.
-See the <a href="%s">%s ports page</a> for current information.',
+<p style="clear:both">[% g('Note that %s is not officially included in the %s archive yet, but the %s porter group keeps their archive in sync with the official archive as close as possible. See the <a href="%s">%s ports page</a> for current information.',

        port.name, organisation, port.name, port.url, port.name) %]</p>
 [% END %]
 
        port.name, organisation, port.name, port.url, port.name) %]</p>
 [% END %]
 

-<p>[% g('Note that in some browsers you will need to tell your browser you want the file saved to a file.
-For example, in Firefox or Mozilla, you should hold the Shift key when you click on the URL.') %]</p>
+<p>[% g('Note that in some browsers you will need to tell your browser you want the file saved to a file. For example, in Firefox or Mozilla, you should hold the Shift key when you click on the URL.') %]</p>

 
 </div>
 
 
 </div>
 

diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index 939380cf38b17ce2f6f58d47fc9a0d209141ec60..31dd928081e89da21562917739e62dc7fdabc792 100644 (file)
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -69,13 +69,10 @@
 
 [% IF too_many_hits %]
 [% IF opts.searchon != "names" %]
 
 [% IF too_many_hits %]
 [% IF opts.searchon != "names" %]

-<p id="psearchtoomanyhits">[% g("Note that this only shows the best matches, sorted by relevance.
-If the first few packages don't match what you searched for, try using more keywords or alternative
-keywords.") %]</p>
+<p id="psearchtoomanyhits">[% g("Note that this only shows the best matches, sorted by relevance. If the first few packages don't match what you searched for, try using more keywords or alternative keywords.") %]</p>

 [% ELSE %]
 [% ELSE %]

-<p id="psearchtoomanyhits">[% g('Your search was too wide so we will only display exact matches.
-At least <em>%u</em> results have been omitted and will not be displayed.
-Please consider using a longer keyword or more keywords.', too_many_hits) %]</p>
+<p id="psearchtoomanyhits">[% g('Your search was too wide so we will only display exact matches. At least <em>%u</em> results have been omitted and will not be displayed. Please consider using a longer keyword or more keywords.',
+       too_many_hits) %]</p>

 [% END; END %]
 
 [% UNLESS results %]
 [% END; END %]
 
 [% UNLESS results %]

diff --git a/templates/html/search_contents.tmpl b/templates/html/search_contents.tmpl
index 513b4514df5cbf33bbf87cdfb128c8d751eda582..93ff2c6fe1bcf95e759cf73b03de0900c56ab003 100644 (file)
--- a/templates/html/search_contents.tmpl
+++ b/templates/html/search_contents.tmpl
@@ -85,8 +85,7 @@
 [% g('Found <strong>%u results</strong>.', results.size) %]
 
 [% IF too_many_hits %]
 [% g('Found <strong>%u results</strong>.', results.size) %]
 
 [% IF too_many_hits %]

-<p id="psearchtoomanyhits">[% g('Note: Your search was too wide so we will only display only the first about 100 matches.
-Please consider using a longer keyword or more keywords.') %]</p>
+<p id="psearchtoomanyhits">[% g('Note: Your search was too wide so we will only display only the first about 100 matches. Please consider using a longer keyword or more keywords.') %]</p>

 [% END %]
 
 <table>
 [% END %]
 
 <table>

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 808c517aef6e94e68c8789bc93e1f0be9288ca2d..59a125c7830fa400fc5c3b79cfadc362a0dbde76 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -143,16 +143,13 @@
 [% changelog_link = 'changelog';
    changelog_link = "$changelogs_url$files.changelog.path" %] 
 <h2>[% g('Experimental package') %]</h2>
 [% changelog_link = 'changelog';
    changelog_link = "$changelogs_url$files.changelog.path" %] 
 <h2>[% g('Experimental package') %]</h2>

-<p>[% g('Warning: This package is from the <strong>experimental</strong> distribution.
-That means it is likely unstable or buggy, and it may even cause data loss.
-Please be sure to consult the <a href="%s">changelog</a> and other possible documentation before
-using it.', changelog_link) %]</p>
+<p>[% g('Warning: This package is from the <strong>experimental</strong> distribution. That means it is likely unstable or buggy, and it may even cause data loss. Please be sure to consult the <a href="%s">changelog</a> and other possible documentation before using it.',
+       changelog_link) %]</p>

 [% END %]
 [% IF subsection == "debian-installer" %]
 <h2>[% g('debian-installer udeb package') %]</h2>
 [% END %]
 [% IF subsection == "debian-installer" %]
 <h2>[% g('debian-installer udeb package') %]</h2>

-<p>[% g('Warning: This package is intended for the use in building
-<a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only.
-Do not install it on a normal %s system.', organisation ) %]</p>
+<p>[% g('Warning: This package is intended for the use in building <a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only. Do not install it on a normal %s system.',
+       organisation ) %]</p>

 [% END %]
 </div>
 [% END %]
 [% END %]
 </div>
 [% END %]