Make language override URLs more robust

[deb/packages.git] / templates / html / foot.tmpl

diff --git a/templates/html/foot.tmpl b/templates/html/foot.tmpl
index a08d34c866404010f76c5b1fd8e43069586c4313..b911d789a3908b5b5408ff2e58c701b2ff7a055c 100644 (file)
--- a/templates/html/foot.tmpl
+++ b/templates/html/foot.tmpl
@@ -11,7 +11,11 @@ Total page evaluation took [% benchmark %]<br>
 <p>[% g('This page is also available in the following languages:') %]</p>
 <p class="navpara">
 [% FOREACH l IN langs %]
-<a href="[% "$page_name?lang=$l.lang" %]" title="[% l.tooltip %]" hreflang="[% l.lang %]" lang="[% l.lang %]" rel="alternate">[% l.selfname %]
+<a href="[% IF keyword_esc;
+               make_search_url('',"keywords=$keyword_esc",'lang',l.lang);
+           ELSE;
+               make_url(page_name,"",'lang',l.lang);
+           END %]" title="[% l.tooltip %]" hreflang="[% l.lang %]" lang="[% l.lang %]" rel="alternate">[% l.selfname %]
 [%- IF l.transliteration %] ([% l.transliteration %])[% END %]</a>
 [% END %]
 </p>
@@ -20,7 +24,7 @@ Total page evaluation took [% benchmark %]<br>
 [% END %]
 
 <hr class="hidecss">
-<p [%- ' class="bordertop"' IF langs.size > 0 %]>[% g('Back to:') %] <a href="[% homepage %]">[% g('%s Homepage', organisation) %]</a> || <a href="[% searchformurl %]">[% g('Packages search page') %]</a></p>
+<p [%- ' class="bordertop"' IF langs.size > 0 %]>[% g('Back to:') %] <a href="[% project_homepage %]">[% g('%s Homepage', organisation) %]</a> || <a href="[% searchformurl %]">[% g('Packages search page') %]</a></p>
 
 <hr class="hidecss">
 <div id="fineprint" class="bordertop">