X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=templates%2Fhtml%2Fdownload.tmpl;h=97ef81e054d9d9ecb77499d944facfddbde14e5e;hp=360d0cfc5cc2c4a6961c42c320881297de0de1ac;hb=1c880dbbb5b885dd620120354e735c06280030df;hpb=0880bf05ed7ba9b5700e0df614bfe607344f07b8

diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index 360d0cf..97ef81e 100644
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -20,35 +20,31 @@
 [% END %]
 
 <div class="pconstantnag">
-<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.',
+<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" %]
+<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 == "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) %]
+[% ELSIF archive == "security" %]
+<pre>
+deb [% 'http://' _ security_mirror_url %] [% suite _ security_suite_suffix %] main [% section IF section != main_section %]
+</pre>
 [% ELSE %]
 <pre>
-deb http://security.debian.org/debian-security [% suite _ "/updates" %] main [% section IF section != main_section %]
+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>
-<p>[% g('Warning: This package is from the <strong>experimental</strong> distribution.
-That means it is likely unstable or buggy, and it may even cause data loss.
-Please be sure to consult the changelog and other possible documentation before
-using it.') %]</p>
+<p>[% g('Warning: This package is from the <strong>experimental</strong> distribution. That means it is likely unstable or buggy, and it may even cause data loss. Please be sure to consult the changelog and other possible documentation before using it.') %]</p>
 [% END %]
 [% IF subsection == "debian-installer" %]
 <h2>[% g('debian-installer udeb package') %]</h2>
-<p>[% g('Warning: This package is intended for the use in building
-<a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only.
-Do not install it on a normal %s system.', organisation) %]</p>
+<p>[% g('Warning: This package is intended for the use in building <a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only. Do not install it on a normal %s system.', organisation) %]</p>
 [% END %]
 </div>
 
@@ -82,15 +78,15 @@ Do not install it on a normal %s system.', organisation) %]</p>
   </div>
 [% ELSE %]
 <p>[% g('You can download the requested file from the <tt>%s</tt> subdirectory at:', filename.directory) %]</p>
-<ul><li><a href="http://security.debian.org/debian-security/[% filename.full %]">security.debian.org/debian-security</a></li></ul>
-<p>[% g('Debian security updates are currently officially distributed only via <tt>security.debian.org</tt>.') %]</p>
+<ul><li><a href="http://[% security_mirror_url %]/[% filename.full %]">[% security_mirror_url %]</a></li></ul>
+<p>[% g('%s security updates are officially distributed only via <tt>%s</tt>.',
+	organisation, security_mirror) %]</p>
 [% END %]
 
 <div id="pdownloadnotes">
 
 [% IF a.mirror_list %]
-<p style="clear:both">[% g('If none of the above sites are fast enough for you,
-please see our <a href="%s">complete mirror list</a>.', a.mirror_list ) %]</p>
+<p style="clear:both">[% g('If none of the above sites are fast enough for you, please see our <a href="%s">complete mirror list</a>.', a.mirror_list ) %]</p>
 [% END %]
 
 [% IF a.unofficial_port %]
@@ -98,23 +94,20 @@ please see our <a href="%s">complete mirror list</a>.', a.mirror_list ) %]</p>
 [% IF port.url_name;
    SET port.url = ports_url _ port.url_name _ '/';
    END -%]
-<p style="clear:both">[% g('Note that %s is not officially included in the %s archive yet,
-but the %s porter group keeps their archive in sync with the official archive as close as possible.
-See the <a href="%s">%s ports page</a> for current information.',
+<p style="clear:both">[% g('Note that %s is not officially included in the %s archive yet, but the %s porter group keeps their archive in sync with the official archive as close as possible. See the <a href="%s">%s ports page</a> for current information.',
 	port.name, organisation, port.name, port.url, port.name) %]</p>
 [% END %]
 
-<p>[% g('Note that in some browsers you will need to tell your browser you want the file saved to a file.
-For example, in Firefox or Mozilla, you should hold the Shift key when you click on the URL.') %]</p>
+<p>[% g('Note that in some browsers you will need to tell your browser you want the file saved to a file. For example, in Firefox or Mozilla, you should hold the Shift key when you click on the URL.') %]</p>
 
 </div>
 
 <h3>[% g('More information on <kbd>%s</kbd>:', filename.file) %]</h3>
 <table id="pdownloadmeta">
-<tr><th>[% g('Exact Size') %]</th>	<td class="size">[% g('%s Byte (%s %s)', size, pkgsize, pkgsize_unit) %]</td>
+<tr><th>[% g('Exact Size') %]</th>	<td class="size">[% g('%s Byte (%s %s)', size, num.format_number(pkgsize,1), pkgsize_unit) %]</td>
 <tr><th>[% g('MD5 checksum') %]</th>	<td><tt>[% md5sum %]</tt></td>
 <tr><th>[% g('SHA1 checksum') %]</th>	<td><tt>[% sha1 || g('Not Available') %]</tt></td>
 <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" -%]