ttxgettext: Fix to actually include comments into the .pot files

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

diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index 416f3db56db8fc3ec8b1c81180554f69a5e3b0e1..a0cae2baf2f435cff7fa59f1f698d1d2ee19894c 100644 (file)
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -8,7 +8,6 @@ use Exporter;
 
 use Deb::Versions;
 use Packages::Config qw( $TOPDIR );
-use Packages::I18N::Locale;
 use Packages::CGI;
 
 our @ISA = qw( Exporter );
@@ -26,15 +25,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 subsection 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";
@@ -55,7 +57,7 @@ sub send_file {
        my $buffer;
        if (open( INDEX, '<', "$wwwdir/$path" )) {
            my %headers;
-           $headers{'-charset'} = get_charset( $opts->{lang} );
+           $headers{'-charset'} = 'UTF-8';
            $headers{'-type'} = get_mime( $opts->{format}, 'text/plain' );
            $headers{'-content-encoding'} = $encoding{$opts->{format}} if exists $encoding{$opts->{format}};
            my ($size,$mtime) = (stat("$wwwdir/$path"))[7,9];
@@ -70,7 +72,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, $! ) );
        }
     }