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 c7c273ea3fc38a5079dcaef7d742c090ee094bea..b911d789a3908b5b5408ff2e58c701b2ff7a055c 100644 (file)
--- a/templates/html/foot.tmpl
+++ b/templates/html/foot.tmpl
@@ -8,28 +8,35 @@ Total page evaluation took [% benchmark %]<br>
 [% IF langs.size > 0 %]
 <hr class="hidecss">
 <!--UdmComment-->
-<p>This page is also available in the following languages:</p>
+<p>[% g('This page is also available in the following languages:') %]</p>
 <p class="navpara">
-[% FOREACH langs %]
-<a href="[% "$name?lang=$lang" %]" title="[% tooltip %]" hreflang="[% lang %]" lang="[% lang %]" rel="alternate">[% selfname %]
-[%- IF transliteration %] ([% transliteration %])[% END %]</a>
+[% FOREACH l IN langs %]
+<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>
-<p>How to set <a href="[% cn_help_url %]">the default document language</a></p>
+<p>[% g('How to set <a href="%s">the default document language</a>', cn_help_url) %]</p>
 <!--/UdmComment-->
 [% END %]
 
 <hr class="hidecss">
-<p [%- ' class="bordertop"' IF langs.size > 0 %]>Back to: <a href="[% homepage %]">[% organisation %] homepage</a> || <a href="[% searchformurl %]">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">
-<p>To report a problem with the web site, e-mail <a href="mailto:[% contact.mail %]">[% contact.mail %]</a>. For other contact information, see the [% organisation %] <a href="[% contact.url %]">contact page</a>.</p>
-<p>[% IF timestamp.string %]Generated: [% timestamp.string %]<br>[% END %]
-[% UNLESS footer.doNotDisplayCopyright %]
-Content Copyright &copy; [% copyright.years %] <a href="[% copyright.url %]">[% copyright.name %]</a>; See <a href="[% license.url %]">license terms</a>. [% IF trademarknotes -%][% trademarknotes %][%- END %]
-[% END %]
-<p><a href="/about/">Learn more about this site</a>.</p>
+<p>[% g('To report a problem with the web site, e-mail <a href="mailto:%s">%s</a>. For other contact information, see the %s <a href="%s">contact page</a>.',
+       contact.mail, contact.mail, organisation, contact.url) %]</p>
+<p>[% IF timestamp.string; g('Generated:') _ ' ' _ timestamp.string _ '<br>'; END %]
+[% UNLESS footer.doNotDisplayCopyright;
+       g('Content Copyright &copy; %s <a href="%s">%s</a>; See <a href="%s">license terms</a>.',
+               copyright.years, copyright.url, copyright.name, license.url);
+       ' ' _ trademarknotes IF trademarknotes;
+END %]
+<p><a href="/about/">[% g('Learn more about this site') %]</a>.</p>
 </div> <!-- end fineprint -->
 </div> <!-- end footer -->
 </div> <!-- end outer -->