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 bf84444962d9e39ffe905b9a89fcea9aea1b7fee..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) {
@@ -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;
                }