X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=templates%2Fhtml%2Fsearch.tmpl;h=f90586ae51b4d46a47fb803aa07fc6e94f5b3464;hp=e5105bf7ef56638b786651850e70fdc407d1c4f3;hb=cc6c820a1e503808b7ac1e2bff132de23f87606b;hpb=078ddbf7006d957bbef2daa9735ec9a8bf3d8fcd

diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index e5105bf..f90586a 100644
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -1,27 +1,100 @@
 [%- PROCESS 'config/archive_layout.tmpl' -%]
+[%- keyword_str = search_keywords.join(' ');
+   keyword_esc = uri_escape(keyword_str);
+   keyword_enc = html_encode(keyword_str);
+
+   section_str = params.values.section.no_replace.join(', ');
+   section_esc = uri_escape(section_str);
+   section_enc = html_encode(section_str);
+
+   suite_str = params.values.suite.no_replace.join(', ');
+   suite_esc = uri_escape(suite_str);
+   suite_enc = html_encode(suite_str);
+
+   architectures_str = params.values.arch.no_replace.join(', ');
+   architectures_esc = uri_escape(architectures_str);
+   architectures_enc = html_encode(architectures_str);
+-%]
 [%- PROCESS 'html/head.tmpl'
-   title_tag = 'Debian Package Search Results'
+   title_tag = g("Package Search Results -- %s", keyword_enc)
    print_search_field = 'packages'
-   navigation = [ { name => 'Package Search Results' } ]
+   search_field_values = {
+	keywords => search_keywords.join(' '),
+	searchon => opts.searchon_form,
+	suite => params.values.suite.no_replace.join(','),
+	architectures => params.values.arch.no_replace.join(','),
+	sections => params.values.section.no_replace.join(','),
+    }
+   navigation = [ { name => g('Package Search Results') } ]
 -%]
 
+<div id="psearchsug">
+[% UNLESS results %]
+	<p>[% g('You can try a different search on the <a href="%s#search_packages">Packages search page</a>.',
+		searchformurl) %]</p>
+	
+	[% IF opts.searchon != "names" && opts.exact %]
+	<p>[% g('You have searched only for words exactly matching your keywords. You can try to search <a href="%s">allowing subword matching</a>.',
+		make_search_url('',"keywords=$keyword_esc",'exact',0) ) %]</p>
+	[% END %]
+[% END %]
+[% IF opts.searchon == "names" && non_results %]
+<p>[% g('<a href="%s">%u</a> results have not been displayed due to the search parameters.',
+	"$search_url$keyword_esc", non_results) %]</p>
+[% END %]
+</div>
+
 [%- PROCESS 'html/messages.tmpl' -%]
 
 <div id="psearchres">
-<p>Found <em>[% results %]</em> matching packages.</p>
+
+[% suite_wording = suite_enc.match("^(default|all)$") ? g("all suites") : g("suite(s) <em>$suite_enc</em>");
+   section_wording = (section_enc == 'all') ? g("all sections") : g("section(s) <em>$section_enc</em>");
+   arch_wording = (architectures_enc == 'any') ? g("all architectures") : g("architecture(s) <em>$architectures_enc</em>");
+    IF opts.searchon == "names";
+	source_wording = opts.source ? g("source packages") : g("packages");
+	msg = g("You have searched for %s that names contain <em>%s</em> 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 <em>%s</em> in packages names and descriptions in %s, %s, and %s%s.",
+		keyword_enc, suite_wording, section_wording, arch_wording, exact_wording);
+    END %]
+<p>[% msg %]
+
+[% IF results %]
+[% g('Found <strong>%u</strong> matching packages.', results) %]</p>
+[% END %]
+
+[% 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>
+[% 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>
+[% END; END %]
+
+[% UNLESS results %]
+<p id="psearchnoresult">[% g('Sorry, your search gave no results') %]</p>
+[% END %]
+
 [% FOREACH categories %]
   [% "<h2>$name</h2>" IF name %]
 
 [% FOREACH packages %]
-  <h3>Package [% pkg %]</h3>
+  <h3>[% g('Package %s', pkg) %]</h3>
   <ul>
-  [% FOREACH s IN suites %]
-    <li><a class="resultlink" href="[% make_url(pkg,'','suite',s.suite) %]">[% s.suite %]</a>[% ' (' _ s.subsect _ ')' IF s.subsect %]: [% s.desc %]  [%- IF s.section != main_section %] [<strong class="pmarker">[% s.section %]</strong>][% END %]
+  [% FOREACH s IN suites;
+	suite = s.suite %]
+    <li class="[% suite %]"><a class="resultlink" href="[% make_url(pkg,'','suite',suite,'arch','','section','') %]">[% suite %]
+	[%- ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite %]</a>[% ' (' _ 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 %] [<strong class="pmarker">[% s.section %]</strong>][% END %]
     [% FOREACH s.versions %]
       <br>[% version %] [%- IF archive != main_archive %] [<strong class="pmarker">[% archive %]</strong>][% END %]: [% architectures.join(' ') %]
     [% END %]
     [% IF s.providers %]
-	<br>[% 'also ' IF s.versions.size > 0 %]provided by: [% FOREACH provider IN s.providers %]<a href="[% make_url(provider,'','suite',suite) %]">[% provider %]</a>[% ', ' UNLESS loop.last %][% END %]
+	<br>[% IF s.versions.size > 0; g('also provided by:'); ELSE; g('provided by:'); END %]
+	[% FOREACH provider IN s.providers.sort %]<a href="[% make_url(provider,'','suite',suite) %]">[% provider %]</a>[% ', ' UNLESS loop.last %][% END %]
     [% END %]
     </li>
   [% END %]
@@ -29,17 +102,17 @@
 [% END %]
 
 [% FOREACH src_packages %]
-  <h3>Source Package [% pkg %]</h3>
+  <h3>[% g('Source Package %s', pkg) %]</h3>
   <ul>
   [% FOREACH origins %]
      [% origin = (archive == main_archive) ? suite : "$suite/$archive";
 	js_id = string2id("$pkg$suite$archive")  %]
-    <li><a class="resultlink" href="[% make_url(pkg,'','source','source','suite',origin) %]">[% origin %]</a> ([% subsection %]): [% version %]
+    <li><a class="resultlink" href="[% make_url(pkg,'','source','source','suite',origin,'section','','arch','') %]">[% origin %]</a> ([% subsection %]): [% version %]
       [%- IF section %] [<strong class="pmarker">[% section %]</strong>][% END %]
       [%- IF real_archive %] [<strong class="pmarker">[% real_archive %]</strong>][% END %]
-    <br>Binary packages: <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]" class="binaries">[% FOREACH binary IN binaries %]<a href="[% make_url(binary,'','source','','suite',suite,'archive',archive) %]">[% binary %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
+    <br>[% g('Binary packages:') %] <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]" class="binaries">[% FOREACH binary IN binaries.sort %]<a href="[% make_url(binary,'','source','','suite',suite,'archive',archive,'arch','','archive','') %]">[% binary %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
 	[% IF binaries.size > 10 %]
-	<script type="text/javascript">init_toggle_elem("[% js_id %]","[% binaries.size %] binary packages")</script>
+	<script type="text/javascript">init_toggle_elem("[% js_id %]","[% g('%u binary packages', binaries.size) %])</script>
 	[% END %]
     </li>
   [% END %]
@@ -49,7 +122,10 @@
 [% END %]
 
 [% IF skipped %]
-  <p><a href="[% make_search_url('',"keywords=$keywords",'exact', 0) %]">[% skipped %]</a> results have not been displayed because you requested only exact matches.
+  <p>[% g('<a href="%s">%u</a> results have not been displayed because you requested only exact matches.',
+	make_search_url('',"keywords=$keyword_esc",'exact', 0), skipped) %]
 [% END %]
 
 </div>
+
+[%- PROCESS 'html/foot.tmpl' -%]