X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=6f8a71ce8a300c9b2b840f98f4abcbd7858cf640;hb=f9f183095d5100a9cecc864361e19881601d780f;hp=6852c13a657c9033c00b913385f6d060761893f4;hpb=ab47ae363dddbc35743572c62fae6350dcb7cf96;p=deb%2Fpackages.git
diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 6852c13..6f8a71c 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -1,6 +1,7 @@
package Packages::DoShow;
use strict;
+use warnings;
use POSIX;
use URI::Escape;
@@ -81,7 +82,7 @@ sub do_show {
if ($suite eq $_) {
$$menu .= "[ $_ ] ";
} else {
- $$menu .= "[ $suite})."\">$_ ] ";
+ $$menu .= "[ $_})."\">$_ ] ";
}
}
$$menu .= '
';
@@ -143,8 +144,6 @@ sub do_show {
$long_desc =~ s/\n /\n/sgo;
$long_desc =~ s/\n.\n/\n
\n/go; $long_desc =~ s/(((\n|\A) [^\n]*)+)/\n
$1\n<\/pre>/sgo; -# $long_desc = conv_desc( $lang, $long_desc ); -# $short_desc = conv_desc( $lang, $short_desc ); my @menu = ( [ _g( "Distribution:" ), _g( "Overview over this suite" ), make_url("/",''), @@ -153,7 +152,6 @@ sub do_show { _g( "All packages in this section" ), make_url("$subsection/",''), $subsection ], ); - my $source = $page->get_src('package'); push @menu, [ _g( "Source:" ), _g( "Source package building this package" ), make_url($source,'',{source=>'source'}), @@ -233,9 +231,13 @@ sub do_show { $package_page .= "".$versions->{$a}." " if $multiple_versions; $package_page .= ''; - $package_page .= floor(($sizes_deb->{$a}/102.4)+0.5)/10 . " kB"; + # package size + $package_page .= sprintf(_g('%.1f kB'), + floor(($sizes_deb->{$a}/102.4)+0.5)/10); $package_page .= ' '; - $package_page .= $sizes_inst->{$a} . " kB"; + # installed size + $package_page .= sprintf(_g('%d kB'), + $sizes_inst->{$a}); $package_page .= " \n"; if ( $suite ne "experimental" ) { $package_page .= sprintf( "["._g( "list of files" )."]\n", @@ -380,19 +382,9 @@ sub do_show { foreach( @$source_files ) { my ($src_file_md5, $src_file_size, $src_file_name) = split /\s+/, $_; - my $src_url; - for ("$suite/$archive") { - /security/o && do { - $src_url = $FTP_SITES{security}; last }; - /volatile/o && do { - $src_url = $FTP_SITES{volatile}; last }; - /backports/o && do { - - $src_url = $FTP_SITES{backports}; last }; - /non-us/io && do { - $src_url = $FTP_SITES{'non-US'}; last }; - $src_url = $FTP_SITES{us}; - } + (my $server = lc $archive) =~ s/-//go; # non-US hack + my $src_url = $FTP_SITES{$server} + || $FTP_SITES{us}; $src_url .= "/$source_dir/$src_file_name"; $package_page .= " $src_file_name \n"