Merge commit 'alioth/master'

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 3113683c010cf210de0f24c88162a7189df4b2e8..e6a9d5220dfe764fc607317c91953d861a5294d5 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -273,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 };