Complete translation and minor fixes

[deb/packages.git] / lib / Packages / DoShow.pm

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 51c97e72d0e562127ee14d575457cfcc6d028313..38b34fbe2abc736c37447a26e8c9db016ed47c4e 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -12,7 +12,8 @@ use Exporter;
 
 use Deb::Versions;
 use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @SECTIONS
-                        @ARCHITECTURES %FTP_SITES @DDTP_LANGUAGES);
+                        @ARCHITECTURES %FTP_SITES
+                        @LANGUAGES @DDTP_LANGUAGES);
 use Packages::I18N::Locale;
 use Packages::CGI qw( :DEFAULT make_url make_search_url );
 use Packages::DB;
@@ -179,7 +180,8 @@ sub do_show {
                        my $trans_desc = $desctrans{$desc_md5};
                        if ($trans_desc) {
                            my %trans_desc = split /\000|\001/, $trans_desc;
-                           $contents{used_langs} = ['en', sort keys %trans_desc];
+                           my %all_langs = map { $_ => 1 } (@LANGUAGES, keys %trans_desc);
+                           $contents{used_langs} = [ keys %all_langs ];
                            debug( "TRANSLATIONS: ".join(" ",keys %trans_desc), 2)
                                if DEBUG;
                            while (my ($l, $d) = each %trans_desc) {
@@ -222,7 +224,7 @@ sub do_show {
                        my @downloads;
                        foreach my $a ( @archs ) {
                            my %d = ( arch => $a,
-                                     pkgsize => sprintf( '%.1f', floor(($sizes_deb->{$a}/102.4)+0.5)/10 ),
+                                     pkgsize => floor(($sizes_deb->{$a}/102.4)+0.5)/10,
                                      instsize => $sizes_inst->{$a}, );
 
                            $d{version} = $versions->{$a} if $multiple_versions;
@@ -311,7 +313,7 @@ sub do_show {
                        my $path = "/$source_dir/$src_file_name";
 
                        push @{$contents{srcfiles}}, { server => $server, path => $path, filename => $src_file_name,
-                                                      size => sprintf("%.1f", (floor(($src_file_size/102.4)+0.5)/10)),
+                                                      size => floor(($src_file_size/102.4)+0.5)/10,
                                                       md5sum => $src_file_md5 };
                    }
 
@@ -422,7 +424,7 @@ sub build_deps {
 
            if ($arch_str ||= '') {
                if ($arch_neg) {
-                   $arch_str = _g("not")." $arch_str";
+                   $arch_str = sprintf( _g("not %s"), "$arch_str" );
                } else {
                    $arch_str = $arch_str;
                }