From eb7a14fed094e6a7629cf5154357ccf16c6163ff Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sat, 20 Oct 2007 23:00:06 +0200 Subject: [PATCH] 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 --- templates/html/download.tmpl | 27 +++++++-------------------- templates/html/search.tmpl | 9 +++------ templates/html/search_contents.tmpl | 3 +-- templates/html/show.tmpl | 11 ++++------- 4 files changed, 15 insertions(+), 35 deletions(-) diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl index 360d0cf..5af883d 100644 --- a/templates/html/download.tmpl +++ b/templates/html/download.tmpl @@ -20,13 +20,9 @@ [% END %]
-

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

[% g('If you are running %s, it is strongly suggested to use a package manager like aptitude or synaptic to download and install packages, instead of doing so manually via this website.', organisation, make_url('aptitude','','arch',''), make_url('synaptic','','arch','')) %]

-

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

+

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

[% IF archive != "security" %] 
 deb http://[% mirrors.$archive.europa.0 %] [% 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" %]
 
[% g('Experimental package') %]

-
[% g('Warning: This package is from the experimental 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.') %]

+
[% g('Warning: This package is from the experimental 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.') %]

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

-
[% g('Warning: This package is intended for the use in building
-debian-installer images only.
-Do not install it on a normal %s system.', organisation) %]

+
[% g('Warning: This package is intended for the use in building debian-installer images only. Do not install it on a normal %s system.', organisation) %]

 [% END %]
@@ -89,8 +80,7 @@ Do not install it on a normal %s system.', organisation) %]

[% IF a.mirror_list %] -

[% g('If none of the above sites are fast enough for you, -please see our complete mirror list.', a.mirror_list ) %]

+

[% g('If none of the above sites are fast enough for you, please see our complete mirror list.', a.mirror_list ) %]

[% END %] [% IF a.unofficial_port %] @@ -98,14 +88,11 @@ please see our complete mirror list.', a.mirror_list ) %]

[% IF port.url_name; SET port.url = ports_url _ port.url_name _ '/'; END -%] -

[% 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 %s ports page for current information.', +

[% 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 %s ports page for current information.', port.name, organisation, port.name, port.url, port.name) %]

[% END %] -

[% 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.') %]

+

[% 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.') %]

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

[% 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.") %]

+

[% 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.") %]

[% ELSE %] -

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

+

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

[% END; END %] [% UNLESS results %] diff --git a/templates/html/search_contents.tmpl b/templates/html/search_contents.tmpl index 513b451..93ff2c6 100644 --- a/templates/html/search_contents.tmpl +++ b/templates/html/search_contents.tmpl @@ -85,8 +85,7 @@ [% g('Found %u results.', results.size) %] [% IF too_many_hits %] -

[% 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.') %]

+

[% 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.') %]

[% END %] diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl index 808c517..59a125c 100644 --- a/templates/html/show.tmpl +++ b/templates/html/show.tmpl @@ -143,16 +143,13 @@ [% changelog_link = 'changelog'; changelog_link = "$changelogs_url$files.changelog.path" %]

[% g('Experimental package') %]

-

[% g('Warning: This package is from the experimental 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.', changelog_link) %]

+

[% g('Warning: This package is from the experimental 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.', + changelog_link) %]

[% END %] [% IF subsection == "debian-installer" %]

[% g('debian-installer udeb package') %]

-

[% g('Warning: This package is intended for the use in building -debian-installer images only. -Do not install it on a normal %s system.', organisation ) %]

+

[% g('Warning: This package is intended for the use in building debian-installer images only. Do not install it on a normal %s system.', + organisation ) %]

[% END %] [% END %] -- 2.39.2