X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDispatcher.pm;h=e9b406f0257064f3da54b0c9b23447750ceaaf00;hp=e5c35d4bbb258813d4720dae716d1185e7c67a53;hb=92a6b3d4b5bcd96dfe05ee814722e5e0e47e1d3f;hpb=08aa87adaf6c59131d01f8a4a078dc4e78475788

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index e5c35d4..e9b406f 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -30,7 +30,6 @@ use DB_File;
 use URI::Escape;
 use Benchmark ':hireswallclock';
 use I18N::AcceptLanguage;
-use Locale::gettext;
 
 use Deb::Versions;
 use Packages::Config qw( $DBDIR $ROOT $TEMPLATEDIR $CACHEDIR
@@ -101,9 +100,6 @@ sub do_dispatch {
     debug( "LANGUAGES=@all_langs header=".
 	   ($input->http("Accept-Language")||'').
 	   " http_lang=$http_lang", 1 ) if DEBUG;
-    bindtextdomain ( 'pdo', $LOCALES );
-    bindtextdomain ( 'templates', $LOCALES );
-    textdomain( 'pdo' );
 
     # backwards compatibility stuff
     debug( "SCRIPT_URL=$ENV{SCRIPT_URL} SCRIPT_URI=$ENV{SCRIPT_URI}" ) if DEBUG;
@@ -138,7 +134,7 @@ sub do_dispatch {
 
     my $what_to_do = 'show';
     my $source = 0;
-    if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
+    if (my $path = $ENV{'PATH_INFO'} || $input->param('PATH_INFO')) {
 	my @components = grep { $_ } map { lc $_ } split /\/+/, $path;
 
 	debug( "PATH_INFO=$path components=@components", 3) if DEBUG;
@@ -146,11 +142,11 @@ sub do_dispatch {
 	push @components, 'index' if @components && $path =~ m,/$,;
 
 	my %LANGUAGES = map { $_ => 1 } @all_langs;
-	if (@components > 0 and $LANGUAGES{$components[0]}
+	if (@components > 1 and $LANGUAGES{$components[0]}
 	    and !$input->param('lang')) {
 	    $input->param( 'lang', shift(@components) );
 	}
-	if (@components > 0 and $components[0] eq 'source') {
+	if (@components > 1 and $components[0] eq 'source') {
 	    shift @components;
 	    $input->param( 'source', 1 );
 	}
@@ -158,10 +154,10 @@ sub do_dispatch {
 	    shift @components;
 	    $what_to_do = 'search';
 	    # Done
-	    fatal_error( _g( "search doesn't take any more path elements" ) )
+	    fatal_error( "search doesn't take any more path elements" )
 		if @components;
 	} elsif (@components == 0) {
-	    fatal_error( _g( "We're supposed to display the homepage here, instead of getting dispatch.pl" ) );
+	    fatal_error( "We're supposed to display the homepage here, instead of getting dispatch.pl" );
 	} elsif (@components == 1) {
 	    $what_to_do = 'search';
 	} else {
@@ -184,7 +180,7 @@ sub do_dispatch {
 		my ($cgi, $params_set, $key, $val) = @_;
 		debug("set_param_once key=$key val=$val",4) if DEBUG;
 		if ($params_set->{$key}++) {
-		    fatal_error( sprintf( _g( "%s set more than once in path" ), $key ) );
+		    fatal_error( "$key set more than once in path" );
 		} else {
 		    $cgi->param( $key, $val );
 		}
@@ -219,7 +215,7 @@ sub do_dispatch {
 	    @components = @pkg;
 
 	    if (@components > 1) {
-		fatal_error( sprintf( _g( "two or more packages specified (%s)" ), "@components" ) );
+		fatal_error( "two or more packages specified (@components)" );
 	    }
 	} # else if (@components == 1)
 
@@ -276,17 +272,11 @@ sub do_dispatch {
     my %params = Packages::CGI::parse_params( $input, \%params_def, \%opts );
     Packages::CGI::init_url( $input, \%params, \%opts );
 
-    my $locale = get_locale($opts{lang});
-    my $charset = get_charset($opts{lang});
-    setlocale ( LC_ALL, $locale )
-	or do { debug( "couldn't set locale $locale, using default" ) if DEBUG;
-		setlocale( LC_ALL, get_locale() )
-		    or do {
-			debug( "couldn't set default locale either" ) if DEBUG;
-			setlocale( LC_ALL, "C" );
-		    };
-	    };
-    debug( "locale=$locale charset=$charset", 1 ) if DEBUG;
+    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;
+    $opts{cat} = $cat;
 
     $opts{h_suites} = { map { $_ => 1 } @suites };
     $opts{h_sections} = { map { $_ => 1 } @sections };
@@ -311,13 +301,14 @@ sub do_dispatch {
 
     my $template = new Packages::Template( $TEMPLATEDIR, $opts{format},
 					   { lang => $opts{lang}, charset => $charset,
+					     cat => $cat,
 					     debug => ( DEBUG ? $opts{debug} : 0 ) },
 					   ( $CACHEDIR ? { COMPILE_DIR => $CACHEDIR } : {} ) );
 
     #FIXME: ugly hack
     unless (($what_to_do eq 'allpackages' and $opts{format} =~ /^(html|txt\.gz)/)
 	    || -e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") {
-	fatal_error( _g("requested format not available for this document"),
+	fatal_error( $cat->g("requested format not available for this document"),
 		     "406 requested format not available");
     }