Merge commit 'origin/master' into debian-master

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

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 732974082a15436c3578d59df8d391be2285fe86..e6a9d5220dfe764fc607317c91953d861a5294d5 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -91,7 +91,6 @@ sub do_dispatch {
     my $homedir = dirname($ENV{SCRIPT_FILENAME}).'/../';
     &Packages::Config::init( $homedir );
     &Packages::DB::init();
-    &Packages::I18N::Locale::load( "$homedir/po" );
 
     my $acc = I18N::AcceptLanguage->new();
     my %all_langs = map { $_ => 1 } (@LANGUAGES, @DDTP_LANGUAGES);
@@ -198,8 +197,6 @@ sub do_dispatch {
                    set_param_once( $input, \%params_set, 'suite', $s);
                } elsif (!$need_pkg && $SECTIONS{$_}) {
                    set_param_once( $input, \%params_set, 'section', $_);
-               } elsif (!$need_pkg && $ARCHIVES{$_}) {
-                   set_param_once( $input, \%params_set, 'archive', $_);
                } elsif (!$need_pkg && $sections_descs{$_}) {
                    set_param_once( $input, \%params_set, 'subsection', $_);
                } elsif (!$need_pkg && ($_ eq 'source')) {
@@ -207,6 +204,8 @@ sub do_dispatch {
                } elsif ($ARCHITECTURES{$_}) {
                    set_param_once( $input, \%params_set, 'arch', $_)
                        unless $_ eq 'any';
+               } elsif (!$need_pkg && $ARCHIVES{$_}) {
+                   set_param_once( $input, \%params_set, 'archive', $_);
                } elsif ($PRIORITIES{$_}) {
                    set_param_once( $input, \%params_set, 'priority', $_);
                } else {
@@ -274,9 +273,8 @@ sub do_dispatch {
     Packages::CGI::init_url( $input, \%params, \%opts );
 
     my $charset = "UTF-8";
-    my $cat = Packages::I18N::Locale->get_handle( $opts{lang} )
-       || Packages::I18N::Locale->get_handle( 'en' );
-    die "get_handle failed for $opts{lang}" unless $cat;
+    my $cat = Packages::I18N::Locale->get_handle( $opts{lang}, "en" )
+       or die "get_handle failed for $opts{lang}";
     $opts{cat} = $cat;
 
     $opts{h_suites} = { map { $_ => 1 } @suites };