Packages::Page: How to translate a single string?

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

diff --git a/lib/Packages/DoNewPkg.pm b/lib/Packages/DoNewPkg.pm
index bde30d743fe5c6d21783c5ae8bd5454154d45384..66a0bfe7b3863076109d476d82da8959f3d6aa2f 100644 (file)
--- a/lib/Packages/DoNewPkg.pm
+++ b/lib/Packages/DoNewPkg.pm
@@ -17,12 +17,14 @@ use Packages::Config qw( $TOPDIR @SECTIONS $ROOT );
 
 sub do_newpkg {
     my ($params, $opts, $page_content) = @_;
+    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 (%s)" ), "@{$opts->{suite}}" ) );
+       fatal_error( $cat->g( "more than one suite specified for newpkg (%s)",
+                             "@{$opts->{suite}}" ) );
     }
 
     my $sort_func = sub { $_[0][0] cmp $_[1][0] };
@@ -36,12 +38,16 @@ sub do_newpkg {
        $opts->{section}[0] : undef;
 
     my @new_pkgs;
-    #FIXME: move to Packages::DB?
-    open NEWPKG, '<', "$TOPDIR/files/packages/newpkg_info"
-       or die "can't read newpkg_info file: $!";
+    open NEWPKG, '<', "$TOPDIR/files/packages/newpkg_info_$suite"
+       or do {
+           warn "can't read newpkg_info_$suite: $!";
+           fatal_error( $cat->g("no newpkg information found for suite %s",
+                                $suite) );
+           return;
+    };
     while (<NEWPKG>) {
        chomp;
-       my @data = split /\s/, $_, 10;
+       my @data = split /\s/, $_, 11;
 
        next unless $data[2]; #removed packages
        next unless $data[3] eq $suite;