X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoDownload.pm;h=566195a7c629144395992e62cdf0f4b6bbb89d5f;hb=92a6b3d4b5bcd96dfe05ee814722e5e0e47e1d3f;hp=bd7f8e1660bb5d68b6a0d0233e6c34ffcecdc6fb;hpb=2ec757bb58907b15c43548be5601d4f2b8c7caac;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoDownload.pm b/lib/Packages/DoDownload.pm
index bd7f8e1..566195a 100644
--- a/lib/Packages/DoDownload.pm
+++ b/lib/Packages/DoDownload.pm
@@ -21,22 +21,25 @@ our @EXPORT = qw( do_download );
 
 
 sub do_download {
-    my ($params, $opts, $html_header, $page_content) = @_;
+    my ($params, $opts, $page_content) = @_;
+    my $cat = $opts->{cat};
 
     if ($params->{errors}{package}) {
-	fatal_error( _g( "package not valid or not specified" ) );
+	fatal_error( $cat->g( "package not valid or not specified" ) );
     }
     if ($params->{errors}{suite}) {
-	fatal_error( _g( "suite not valid or not specified" ) );
+	fatal_error( $cat->g( "suite not valid or not specified" ) );
     }
     if ($params->{errors}{arch}) {
-	fatal_error( _g( "architecture not valid or not specified" ) );
+	fatal_error( $cat->g( "architecture not valid or not specified" ) );
     }
     if (@{$opts->{suite}} > 1) {
-	fatal_error( sprintf( _g( "more than one suite specified for download (%s)" ), "@{$opts->{suite}}" ) );
+	fatal_error( $cat->g( "more than one suite specified for download (%s)",
+			      "@{$opts->{suite}}" ) );
     }
     if (@{$opts->{arch}} > 1) {
-	fatal_error( sprintf( _g( "more than one architecture specified for download (%s)" ), "@{$opts->{arch}}" ) );
+	fatal_error( $cat->g( "more than one architecture specified for download (%s)",
+			      "@{$opts->{arch}}" ) );
     }
 
     $opts->{h_sections} = { map { $_ => 1 } @SECTIONS };
@@ -85,11 +88,13 @@ sub do_download {
 	    $page_content->{archive} = $archive;
 	    $page_content->{suite} = $suite;
 	    $page_content->{pkg} = $pkg;
-	    $page_content->{pkgsize} = sprintf( '%.1f', floor(($data{size}/102.4)+0.5)/10 );
-	    $page_content->{pkgsize_unit} = _g( 'kByte' );
-	    if ($page_content->{pkgsize} > 1024) {
+	    my $pkgsize = floor(($data{size}/102.4)+0.5)/10;
+	    if ($pkgsize < 1024) {
+		$page_content->{pkgsize} = sprintf( '%.1f', $pkgsize );
+		$page_content->{pkgsize_unit} = $cat->g( 'kByte' );
+	    } else {
 		$page_content->{pkgsize} = sprintf( '%.1f', floor(($data{size}/(102.4*102.4))+0.5)/100 );
-		$page_content->{pkgsize_unit} = _g( 'MByte' );
+		$page_content->{pkgsize_unit} = $cat->g( 'MByte' );
 	    }
 	    $page_content->{architecture} = $arch;
 	    foreach (keys %data) {