X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDoNewPkg.pm;h=44960896ec23061af29edf30453ab0237166e01a;hp=9be98d54aba8b0724c13106b7d8cf077220116b2;hb=cc6c820a1e503808b7ac1e2bff132de23f87606b;hpb=d02b6c592e4938cf4dc3113ca5fd92e4f79af6d8 diff --git a/lib/Packages/DoNewPkg.pm b/lib/Packages/DoNewPkg.pm index 9be98d5..4496089 100644 --- a/lib/Packages/DoNewPkg.pm +++ b/lib/Packages/DoNewPkg.pm @@ -9,7 +9,6 @@ use Exporter; our @ISA = qw( Exporter ); our @EXPORT = qw( do_newpkg ); -use Packages::I18N::Locale; use Packages::Search qw( :all ); use Packages::CGI; use Packages::DB; @@ -17,12 +16,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 newpkg (%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] }; @@ -39,8 +40,8 @@ sub do_newpkg { open NEWPKG, '<', "$TOPDIR/files/packages/newpkg_info_$suite" or do { warn "can't read newpkg_info_$suite: $!"; - fatal_error( sprintf( _g("no newpkg information found for suite %s"), - $suite) ); + fatal_error( $cat->g("no newpkg information found for suite %s", + $suite) ); return; }; while () {