X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FDoIndex.pm;h=6d8d4b6dc112ee36c18188956a35f1f34a83cad8;hb=35396b36e9658cb7346fb080531fff92a6d0fd57;hp=45a5b494bf8a7ba16da24b9a0a1b0093590190c9;hpb=406e4a74469f551c3cbbb137181c1415dde050c9;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index 45a5b49..6d8d4b6 100644
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -26,15 +26,18 @@ my %encoding = (
 		);
 sub send_file {
     my ($file, $params, $opts) = @_;
+    my $cat = $opts->{cat};
 
     if ($params->{errors}{suite}) {
-	fatal_error( _g( "suite not valid or not specified" ) );
+	fatal_error( $cat->g( "suite not valid or not specified" ) );
     }
     if (@{$opts->{suite}} > 1) {
-	fatal_error( sprintf( _g( "more than one suite specified for show_static (%s)" ), "@{$opts->{suite}}" ) );
+	fatal_error( $cat->g( "more than one suite specified for show_static (%s)",
+			      "@{$opts->{suite}}" ) );
     }
     if (@{$opts->{subsection}} > 1) {
-	fatal_error( sprintf( _g( "more than one suite specified for show_static (%s)" ), "@{$opts->{suite}}" ) );
+	fatal_error( $cat->g( "more than one subsection specified for show_static (%s)",
+			      "@{$opts->{suite}}" ) );
     }
 
     my $wwwdir = "$TOPDIR/www";
@@ -44,14 +47,12 @@ sub send_file {
     $path .= "$opts->{archive}[0]/" if @{$opts->{archive}} == 1;
     $path .= "$opts->{subsection}[0]/" if @{$opts->{subsection}};
     $path .= "$opts->{priority}[0]/" if @{$opts->{priority}};
-    # we don't have translated index pages for subsections yet
-    $opts->{lang} = 'en' if @{$opts->{subsection}} or $file eq 'allpackages';
 
     #FIXME: ugly hack
     if ($opts->{lang} ne 'en' and !-f "$wwwdir/$path$file.$opts->{lang}.$opts->{format}") {
-    	$opts->{lang} = 'en';
+	$opts->{lang} = 'en';
     }
-    $path .= "$file.$opts->{lang}.$opts->{format}";	
+    $path .= "$file.$opts->{lang}.$opts->{format}";
 
     unless (@Packages::CGI::fatal_errors) {
 	my $buffer;
@@ -72,7 +73,7 @@ sub send_file {
 	    close INDEX;
 	    exit;
 	} else {
-	    fatal_error( sprintf( _g( "couldn't read index file %s: %s" ),
+	    fatal_error( $cat->g( "couldn't read index file %s: %s",
 				  $path, $! ) );
 	}
     }