use URI::Escape;
use Benchmark ':hireswallclock';
use I18N::AcceptLanguage;
-use Locale::gettext;
use Deb::Versions;
use Packages::Config qw( $DBDIR $ROOT $TEMPLATEDIR $CACHEDIR
@SUITES @SECTIONS @ARCHIVES @ARCHITECTURES @PRIORITIES
- @LANGUAGES @DDTP_LANGUAGES $LOCALES );
+ @LANGUAGES @DDTP_LANGUAGES );
use Packages::CGI qw( :DEFAULT error get_all_messages );
use Packages::DB;
use Packages::Search qw( :all );
shift @components;
$what_to_do = 'search';
# Done
- fatal_error( _g( "search doesn't take any more path elements" ) )
+ fatal_error( "search doesn't take any more path elements" )
if @components;
} elsif (@components == 0) {
- fatal_error( _g( "We're supposed to display the homepage here, instead of getting dispatch.pl" ) );
+ fatal_error( "We're supposed to display the homepage here, instead of getting dispatch.pl" );
} elsif (@components == 1) {
$what_to_do = 'search';
} else {
my ($cgi, $params_set, $key, $val) = @_;
debug("set_param_once key=$key val=$val",4) if DEBUG;
if ($params_set->{$key}++) {
- fatal_error( sprintf( _g( "%s set more than once in path" ), $key ) );
+ fatal_error( "$key set more than once in path" );
} else {
$cgi->param( $key, $val );
}
set_param_once( $input, \%params_set, 'suite', $s);
} elsif (!$need_pkg && $SECTIONS{$_}) {
set_param_once( $input, \%params_set, 'section', $_);
- } elsif (!$need_pkg && $ARCHIVES{$_}) {
- set_param_once( $input, \%params_set, 'archive', $_);
} elsif (!$need_pkg && $sections_descs{$_}) {
set_param_once( $input, \%params_set, 'subsection', $_);
} elsif (!$need_pkg && ($_ eq 'source')) {
} elsif ($ARCHITECTURES{$_}) {
set_param_once( $input, \%params_set, 'arch', $_)
unless $_ eq 'any';
+ } elsif (!$need_pkg && $ARCHIVES{$_}) {
+ set_param_once( $input, \%params_set, 'archive', $_);
} elsif ($PRIORITIES{$_}) {
set_param_once( $input, \%params_set, 'priority', $_);
} else {
@components = @pkg;
if (@components > 1) {
- fatal_error( sprintf( _g( "two or more packages specified (%s)" ), "@components" ) );
+ fatal_error( "two or more packages specified (@components)" );
}
} # else if (@components == 1)
replace => { all => \@ARCHIVES,
default => \@ARCHIVES} },
exact => { default => 0, match => '^(\w+)$', },
- lang => { default => $http_lang, match => '^(\w+)$', },
+ lang => { default => $http_lang, match => '^([\w-]+)$', },
source => { default => 0, match => '^(\d+)$', },
debug => { default => 0, match => '^(\d+)$', },
searchon => { default => 'names', match => '^(\w+)$', },
my $charset = "UTF-8";
my $cat = Packages::I18N::Locale->get_handle( $opts{lang} )
- or die "get_handle failed";
+ || Packages::I18N::Locale->get_handle( 'en' );
+ die "get_handle failed for $opts{lang}" unless $cat;
+ $opts{cat} = $cat;
$opts{h_suites} = { map { $_ => 1 } @suites };
$opts{h_sections} = { map { $_ => 1 } @sections };
#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( _g("requested format not available for this document"),
+ fatal_error( $cat->g("requested format not available for this document"),
"406 requested format not available");
}