X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fhtml%2Fsearch.tmpl;h=f7eace51ae2cb803afc13e2665125017c29b15f0;hb=b84419b2f87cf3c43b83fca71486be4fae81375e;hp=65729672202c2d2516ec6799f1fe63fcf34ece0c;hpb=8bd0c8390b35da9afc1a843ae5875ed620e98dc4;p=deb%2Fpackages.git
diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index 6572967..f7eace5 100644
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -48,16 +48,16 @@
-[%# @translators: I'm really sorry :/ %]
-[% suite_wording = suite_enc.match("^(default|all)$") ? g("all suites") : g("suite(s)
$suite_enc");
- section_wording = (section_enc == 'all') ? g("all sections") : g("section(s)
$section_enc");
- arch_wording = (architectures_enc == 'any') ? g("all architectures") : g("architecture(s)
$architectures_enc");
+[% suite_wording = suite_enc.match("^(default|all)$") ? g("all suites") : g("suite(s)
%s", suite_enc);
+ section_wording = (section_enc == 'all') ? g("all sections") : g("section(s)
%s", section_enc);
+ arch_wording = (architectures_enc == 'any') ? g("all architectures") : g("architecture(s)
%s", architectures_enc);
IF opts.searchon == "names";
source_wording = opts.source ? g("source packages") : g("packages");
msg = g("You have searched for %s that names contain
%s in %s, %s, and %s.",
source_wording, keyword_enc, suite_wording, section_wording, arch_wording);
ELSE;
exact_wording = opts.exact ? "" : g(" (including subword matching)");
+ # @translators: I'm really sorry :/
msg = g("You have searched for
%s in packages names and descriptions in %s, %s, and %s%s.",
keyword_enc, suite_wording, section_wording, arch_wording, exact_wording);
END %]
@@ -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 %]
@@ -91,12 +88,13 @@ Please consider using a longer keyword or more keywords.', too_many_hits) %]
[% FOREACH s IN suites;
suite = s.suite %]
[% suite %]
- [%- ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite %][% ' (' _ s.subsection _ ')' IF s.subsection %]: [% s.desc %] [%- IF s.section != main_section %] [[% s.section %]][% END %]
+ [%- ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite %][% ' (' _ s.subsection _ ')' IF s.subsection %]: [% IF s.trans_desc.$lang; s.trans_desc.$lang | html; ELSE; s.desc | html; END %] [%- IF s.section && s.section != main_section %] [[% s.section %]][% END %]
[% FOREACH s.versions %]
[% version %] [%- IF archive != main_archive %] [[% archive %]][% END %]: [% architectures.join(' ') %]
[% END %]
[% IF s.providers %]
-
[% 'also ' IF s.versions.size > 0 %][% g('provided by:') %] [% FOREACH provider IN s.providers %][% provider %][% ', ' UNLESS loop.last %][% END %]
+
[% IF s.versions.size > 0; g('also provided by:'); ELSE; g('provided by:'); END %]
+ [% FOREACH provider IN s.providers.sort %][% provider %][% ', ' UNLESS loop.last %][% END %]
[% END %]
[% END %]
@@ -112,9 +110,9 @@ Please consider using a longer keyword or more keywords.', too_many_hits) %]
[% origin %] ([% subsection %]): [% version %]
[%- IF section %] [[% section %]][% END %]
[%- IF real_archive %] [[% real_archive %]][% END %]
-
[% g('Binary packages:') %] [% FOREACH binary IN binaries %][% binary %][% ', ' UNLESS loop.last %][% END %]
+
[% g('Binary packages:') %] [% FOREACH binary IN binaries.sort %][% binary %][% ', ' UNLESS loop.last %][% END %]
[% IF binaries.size > 10 %]
-
+
[% END %]
[% END %]