X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDispatcher.pm;h=3ae8004ee7a577c15ce9750652acb37b0b68de6e;hb=b8b780f25f2cb15def44c3579776c6df15cd6e90;hp=e2b64ad0e409db45ff486fc630825a9dc0ec01a7;hpb=d833a5eed5296d1a24c35e8f0802f8291037198d;p=deb%2Fpackages.git

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index e2b64ad..3ae8004 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -25,6 +25,7 @@ use warnings;
 use CGI;
 use POSIX;
 use File::Basename;
+use URI;
 use URI::Escape;
 use HTML::Entities;
 use Template;
@@ -101,8 +102,9 @@ sub do_dispatch {
 				   \@all_langs ) || 'en';
     debug( "LANGUAGES=@all_langs header=".
 	   ($input->http("Accept-Language")||'').
-	   " http_lang=$http_lang", 2 ) if DEBUG;
+	   " http_lang=$http_lang", 1 ) if DEBUG;
     bindtextdomain ( 'pdo', $LOCALES );
+    bindtextdomain ( 'templates', $LOCALES );
     textdomain( 'pdo' );
 
     # backwards compatibility stuff
@@ -236,9 +238,9 @@ sub do_dispatch {
 				     array => '\s+',
 				     match => '^([-+\@\w\/.:]+)$',
 				 },
-		       package => { default => undef,
-				    match => '^([\w.+-]+)$',
-				    var => \$pkg },
+		       'package' => { default => undef,
+				      match => '^([\w.+-]+)$',
+				      var => \$pkg },
 		       suite => { default => 'default', match => '^([\w-]+)$',
 				  array => ',', var => \@suites,
 				  replace => { all => \@SUITES,
@@ -268,13 +270,13 @@ sub do_dispatch {
 		       arch => { default => 'any', match => '^([\w-]+)$',
 				 array => ',', var => \@archs, replace =>
 				 { any => \@ARCHITECTURES } },
-		       format => { default => 'html', match => '^([\w.]+)$',  },
-		   mode => { default => '', match => '^(\w+)$',  },
-		   sort_by => { default => 'file', match => '^(\w+)$', },
-		   );
+		       'format' => { default => 'html', match => '^([\w.]+)$',  },
+		       mode => { default => '', match => '^(\w+)$',  },
+		       sort_by => { default => 'file', match => '^(\w+)$', },
+		       );
     my %opts;
     my %params = Packages::CGI::parse_params( $input, \%params_def, \%opts );
-Packages::CGI::init_url( $input, \%params, \%opts );
+    Packages::CGI::init_url( $input, \%params, \%opts );
 
     my $locale = get_locale($opts{lang});
     my $charset = get_charset($opts{lang});
@@ -286,7 +288,7 @@ Packages::CGI::init_url( $input, \%params, \%opts );
 			setlocale( LC_ALL, "C" );
 		    };
 	    };
-    debug( "locale=$locale charset=$charset", 2 ) if DEBUG;
+    debug( "locale=$locale charset=$charset", 1 ) if DEBUG;
 
     $opts{h_suites} = { map { $_ => 1 } @suites };
     $opts{h_sections} = { map { $_ => 1 } @sections };
@@ -316,8 +318,8 @@ Packages::CGI::init_url( $input, \%params, \%opts );
 
     #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( "requested format not available for this document",
+	    || -e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") {
+	fatal_error( _g("requested format not available for this document"),
 		     "406 requested format not available");
     }
 
@@ -332,6 +334,12 @@ Packages::CGI::init_url( $input, \%params, \%opts );
 
     $page_content{make_search_url} = sub { return &Packages::CGI::make_search_url(@_) };
     $page_content{make_url} = sub { return &Packages::CGI::make_url(@_) };
+    $page_content{extract_host} = sub { my $uri = URI->new($_[0]);
+					my $host = $uri->host;
+					$host .= ':'.$uri->port if $uri->port != $uri->default_port;
+					return $host;
+				    };
+    $page_content{g} = sub { return &Packages::I18N::Locale::tt_gettext(@_) };
     # needed to work around the limitations of the the FILTER syntax
     $page_content{html_encode} = sub { return HTML::Entities::encode_entities(@_,'<>&"') };
     $page_content{uri_escape} = sub { return URI::Escape::uri_escape(@_) };