Make language override URLs more robust

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

diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index 8cd30c5fbce5681a862d4bcb5de47de6aab0b269..97ef81e054d9d9ecb77499d944facfddbde14e5e 100644 (file)
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -23,15 +23,20 @@
 <p>[% g('If you are running %s, it is strongly suggested to use a package manager like <a href="%s">aptitude</a> or <a href="%s">synaptic</a> to download and install packages, instead of doing so manually via this website.',
        organisation, make_url('aptitude','','arch',''), make_url('synaptic','','arch','')) %]</p>
 <p>[% g('You should be able to use any of the listed mirrors by adding a line to your <kbd>/etc/apt/sources.list</kbd> like this:') %]</p>
-[% IF archive != "security" %]
+[% IF archive == "volatile" %]
 <pre>
-deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section IF section != main_section %]
+deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite.replace('-','/') %] main [% section IF section != main_section %]
 </pre>
 <p>[% g('Replacing <em>%s</em> with the mirror in question.', mirrors.$archive.europa.0) %]
-[% ELSE %]
+[% ELSIF archive == "security" %]
 <pre>
 deb [% 'http://' _ security_mirror_url %] [% suite _ security_suite_suffix %] main [% section IF section != main_section %]
 </pre>
+[% ELSE %]
+<pre>
+deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section IF section != main_section %]
+</pre>
+<p>[% g('Replacing <em>%s</em> with the mirror in question.', mirrors.$archive.europa.0) %]
 [%- END %]
 [% IF suite == "experimental" %]
 <h2>[% g('Experimental package') %]</h2>
@@ -105,4 +110,4 @@ deb [% 'http://' _ security_mirror_url %] [% suite _ security_suite_suffix %] ma
 <tr><th>[% g('SHA256 checksum') %]</th>        <td><tt>[% sha256  || g('Not Available') %]</tt></td>
 </table>
 
-[%- PROCESS 'html/foot.tmpl' -%]
+[%- PROCESS 'html/foot.tmpl' page_name="$pkg/download" -%]