X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoShow.pm;h=e3e1945b6b7cc7123e4705a47f681e79f16106f1;hb=a4c9c1c1debdde95b8e83e85ada074de0fc035d5;hp=076e11f7c3826a909ed459b412eb7a2e898c6b3f;hpb=dc1f8cc1360f5abb632e30e72753e2e132ff9290;p=deb%2Fpackages.git
diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 076e11f..e3e1945 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 .= "[ $_ ] ";
+ $$menu .= "[ $suite})."\">$_ ] ";
}
}
$$menu .= '
';
@@ -143,20 +144,18 @@ 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" ), - "$ROOT/$suite/", + make_url("/",''), $suite ], [ _g( "Section:" ), _g( "All packages in this section" ), - "$ROOT/$suite/$subsection/", + make_url("$subsection/",''), $subsection ], ); my $source = $page->get_src('package'); push @menu, [ _g( "Source:" ), _g( "Source package building this package" ), - "$ROOT/$suite/source/$source", + make_url($source,'',{source=>'source'}), $source ] if $source; $$menu .= simple_menu( @menu ); @@ -171,7 +170,7 @@ sub do_show { $package_page .= title( $title ); if (my $provided_by = $page->{provided_by}) { - note( _g( "This is also a virtual package provided by ").join( ', ', map { "$_" } @$provided_by) ); + note( _g( "This is also a virtual package provided by ").join( ', ', map { "$_" } @$provided_by) ); } if ($suite eq "experimental") { @@ -228,18 +227,22 @@ sub do_show { $package_page .= ""._g( "Package Size")." "._g("Installed Size")." "._g("Files")." \n"; foreach my $a ( @archs ) { $package_page .= "\n"; - $package_page .= " $a \n"; $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", - "$ROOT/$suite/$encodedpkg/$a/filelist", $pkg ); + make_url("$encodedpkg/$a/filelist",''), $pkg ); } else { $package_page .= _g( "no current information" ); } @@ -262,11 +265,11 @@ sub do_show { $$menu .= simple_menu( [ _g( "Distribution:" ), _g( "Overview over this distribution" ), - "$ROOT/", + make_url('/',''), $suite ], [ _g( "Section:" ), _g( "All packages in this section" ), - "$ROOT/$suite/virtual/", + make_url("virtual/",''), 'virtual' ], ); @@ -304,11 +307,11 @@ sub do_show { $$menu .= simple_menu( [ _g( "Distribution:" ), _g( "Overview over this suite" ), - "$ROOT/$suite/", + make_url('/',''), $suite ], [ _g( "Section:" ), _g( "All packages in this section" ), - "$ROOT/$suite/$subsection/", + make_url("$subsection/",''), $subsection ], );