X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDoSearch.pm;h=60052c59bb2b3b2cd03dcca7859e58020c19d1c0;hp=c90a46f022414013856fa7c4a67f6f38ed19e2b3;hb=56d4b3ed57e20359e5ea46feabb850cf4a94caf2;hpb=e6999b858367d9d83e0fa2c32cddfd31b4416486 diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm index c90a46f..60052c5 100644 --- a/lib/Packages/DoSearch.pm +++ b/lib/Packages/DoSearch.pm @@ -12,19 +12,24 @@ our @ISA = qw( Exporter ); our @EXPORT = qw( do_search ); use Deb::Versions; +use Packages::I18N::Locale; use Packages::Search qw( :all ); use Packages::CGI; use Packages::DB; -use Packages::Config qw( $DBDIR $SEARCH_URL $SEARCH_CGI $SEARCH_PAGE +use Packages::HTML qw(marker); +use Packages::Config qw( $DBDIR $SEARCH_URL $SEARCH_PAGE @SUITES @ARCHIVES $ROOT ); +use Packages::HTML; sub do_search { my ($params, $opts, $html_header, $menu, $page_content) = @_; + $Params::Search::too_many_hits = 0; + if ($params->{errors}{keywords}) { - fatal_error( "keyword not valid or missing" ); + fatal_error( _( "keyword not valid or missing" ) ); } elsif (length($opts->{keywords}) < 2) { - fatal_error( "keyword too short (keywords need to have at least two characters)" ); + fatal_error( _( "keyword too short (keywords need to have at least two characters)" ) ); } $$menu = ""; @@ -37,6 +42,7 @@ sub do_search { my $suites_param = join ',', @{$params->{values}{suite}{no_replace}}; my $sections_param = join ',', @{$params->{values}{section}{no_replace}}; my $archs_param = join ',', @{$params->{values}{arch}{no_replace}}; + $opts->{common_params} = "suite=$suites_param§ion=$sections_param&keywords=$keyword_esc&searchon=$searchon&arch=$archs_param"; # for output my $keyword_enc = encode_entities $keyword || ''; @@ -96,43 +102,43 @@ sub do_search { } if ($Packages::Search::too_many_hits) { - error( "Your search was too wide so we will only display exact matches. At least $Packages::Search::too_many_hits results have been omitted and will not be displayed. Please consider using a longer keyword or more keywords." ); + error( sprintf( _( "Your search was too wide so we will only display exact matches. At least %s results have been omitted and will not be displayed. Please consider using a longer keyword or more keywords." ), $Packages::Search::too_many_hits ) ); } if (!@Packages::CGI::fatal_errors && !@results) { - my $printed = 0; if ($searchon eq "names") { unless (@non_results) { - error( "Can't find that package." ); + error( _( "Can't find that package." ) ); } else { - hint( "Can't find that package. ". - "". - ($#non_results+1)."". + hint( _( "Can't find that package." )." ". + sprintf( _( '%s'. " results have not been displayed due to the". - " search parameters." ); + " search parameters." ), "$SEARCH_URL/$keyword_esc" , + $#non_results+1 ) ); } } else { if (($suites_enc eq 'all') && ($archs_enc eq 'any') && ($sections_enc eq 'all')) { - error( "Can't find that string." ); + error( _( "Can't find that string." ) ); } else { - error( "Can't find that string, at least not in that suite ($suites_enc, section $sections_enc) and on that architecture ($archs_enc)." ); + error( sprintf( _( "Can't find that string, at least not in that suite (%s, section %s) and on that architecture (%s)." ), + $suites_enc, $sections_enc, $archs_enc ) ); } if ($opts->{exact}) { - $printed++; - hint( "You have searched only for words exactly matching your keywords. You can try to search allowing subword matching." ); + hint( sprintf( _( 'You have searched only for words exactly matching your keywords. You can try to search allowing subword matching.' ), + encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}") ) ); } } - hint( ( $printed ? "Or you" : "You" )." can try a different search on the Packages search page." ); + hint( sprintf( _( 'You can try a different search on the Packages search page.' ), "$SEARCH_PAGE#search_packages" ) ); } - %$html_header = ( title => 'Package Search Results' , - lang => 'en', - title_tag => 'Debian Package Search Results', + %$html_header = ( title => _( 'Package Search Results' ) , + lang => $opts->{lang}, + title_tag => _( 'Debian Package Search Results' ), print_title => 1, print_search_field => 'packages', search_field_values => { @@ -220,20 +226,21 @@ sub print_packages { #my ($start, $end) = multipageheader( $input, scalar @pkgs, \%opts ); my $str = '
'; - $str .= "

Found ".(scalar @$pkgs_list)." matching packages."; + $str .= "

".sprintf( _( "Found %s matching packages." ), + scalar @$pkgs_list )."

"; #my $count = 0; my $have_exact; if (grep { $_ eq $keyword } @$pkgs_list) { $have_exact = 1; - $str .= '

Exact hits

'; + $str .= '

'._( "Exact hits" ).'

'; $str .= &$print_func( $keyword, $pkgs->{$keyword}||{}, map { $_->{$keyword}||{} } @func_args ); @$pkgs_list = grep { $_ ne $keyword } @$pkgs_list; } if (@$pkgs_list && (($opts->{searchon} ne 'names') || !$opts->{exact})) { - $str .= '

Other hits

' + $str .= '

'._( 'Other hits' ).'

' if $have_exact; foreach my $pkg (@$pkgs_list) { @@ -243,8 +250,9 @@ sub print_packages { map { $_->{$pkg}||{} } @func_args ); } } elsif (@$pkgs_list) { - $str .= "

". - ($#{$pkgs_list}+1)." results have not been displayed because you requested only exact matches.

"; + $str .= "

".sprintf( _( '%s results have not been displayed because you requested only exact matches.' ), + encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}"), + scalar @$pkgs_list )."

"; } $str .= '
'; @@ -254,8 +262,8 @@ sub print_packages { sub print_package { my ($pkg, $pkgs, $provided_by, $archives, $sect, $subsect, $desc) = @_; - my $str = sprintf "

Package %s

\n", $pkg; - $str .= "