X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoSearch.pm;h=f55f2cf7e05d28c29788fe6abe96b6b06d724ba4;hb=ace28538cff532f8c5ee31b2cadaf577c0ced079;hp=bc55b747ec41b5091a12ae7f4712bde83d4fb50a;hpb=81a4fde2110a6dcc82e8c6c938dc56fdb53fe6e2;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index bc55b74..f55f2cf 100644
--- a/lib/Packages/DoSearch.pm
+++ b/lib/Packages/DoSearch.pm
@@ -12,12 +12,14 @@ 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::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) = @_;
@@ -25,9 +27,9 @@ sub do_search {
     $Params::Search::too_many_hits = 0;
 
     if ($params->{errors}{keywords}) {
-	fatal_error( "keyword not valid or missing" );
+	fatal_error( _g( "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( _g( "keyword too short (keywords need to have at least two characters)" ) );
     }
 
     $$menu = "";
@@ -79,67 +81,69 @@ sub do_search {
     }
     
 #    use Data::Dumper;
-#    debug( join( "", Dumper( \@results, \@non_results )) );
+#    debug( join( "", Dumper( \@results, \@non_results )) ) if DEBUG;
     my $st1 = new Benchmark;
     my $std = timediff($st1, $st0);
-    debug( "Search took ".timestr($std) );
+    debug( "Search took ".timestr($std) ) if DEBUG;
     
-    my $suite_wording = $suites_enc eq "all" ? "all suites"
-	: "suite(s) <em>$suites_enc</em>";
-    my $section_wording = $sections_enc eq 'all' ? "all sections"
-	: "section(s) <em>$sections_enc</em>";
-    my $arch_wording = $archs_enc eq 'any' ? "all architectures"
-	: "architecture(s) <em>$archs_enc</em>";
+    my $suite_wording = $suites_enc eq "all" ? _g("all suites")
+	: sprintf(_g("suite(s) <em>%s</em>", $suites_enc) );
+    my $section_wording = $sections_enc eq 'all' ? _g("all sections")
+	: sprintf(_g("section(s) <em>%s</em>", $sections_enc) );
+    my $arch_wording = $archs_enc eq 'any' ? _g("all architectures")
+	: sprintf(_g("architecture(s) <em>%s</em>", $archs_enc) );
     if ($searchon eq "names") {
-	my $source_wording = $opts->{source} ? "source " : "";
-	my $exact_wording = $opts->{exact} ? "named" : "that names contain";
-	msg( "You have searched for ${source_wording}packages $exact_wording <em>$keyword_enc</em> in $suite_wording, $section_wording, and $arch_wording." );
+	my $source_wording = $opts->{source} ? _g("source packages") : _g("packages");
+	# sorry to all translators for that one... (patches welcome)
+	msg( sprintf( _g( "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s." ),
+		      $source_wording, $keyword_enc,
+		      $suite_wording, $section_wording, $arch_wording ) );
     } else {
-	my $exact_wording = $opts->{exact} ? "" : " (including subword matching)";
-	msg( "You have searched for <em>$keyword_enc</em> in packages names and descriptions in $suite_wording, $section_wording, and $arch_wording$exact_wording." );
+	my $exact_wording = $opts->{exact} ? "" : _g(" (including subword matching)");
+	msg( sprintf( _g( "You have searched for <em>%s</em> in packages names and descriptions in %s, %s, and %s%s." ),
+		      $keyword_enc,
+		      $suite_wording, $section_wording, $arch_wording,
+		      $exact_wording ) );
     }
 
     if ($Packages::Search::too_many_hits) {
-	error( "Your search was too wide so we will only display exact matches. At least <em>$Packages::Search::too_many_hits</em> results have been omitted and will not be displayed. Please consider using a longer keyword or more keywords." );
+	error( sprintf( _g( "Your search was too wide so we will only display exact matches. At least <em>%s</em> 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( _g( "Can't find that package." ) );
 	    } else {
-		hint( "Can't find that package. ".
-		      "<a href=\"$SEARCH_URL/$keyword_esc\">".
-		      ($#non_results+1)."</a>".
+		hint( _g( "Can't find that package." )." ".
+		      sprintf( _g( '<a href="%s">%s</a>'.
 		      " 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( _g( "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( _g( "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 <a href=\"".
-			encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}")."\">allowing
-			subword matching</a>." );
+		hint( sprintf( _g( 'You have searched only for words exactly matching your keywords. You can try to search <a href="%s">allowing subword matching</a>.' ),
+			       encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}") ) );
 	    }
 	}
-	hint( ( $printed ? "Or you" : "You" )." can try a different search on the <a href=\"$SEARCH_PAGE#search_packages\">Packages search page</a>." );
+	hint( sprintf( _g( 'You can try a different search on the <a href="%s">Packages search page</a>.' ), "$SEARCH_PAGE#search_packages" ) );
 	
     }
 
-    %$html_header = ( title => 'Package Search Results' ,
-		      lang => 'en',
-		      title_tag => 'Debian Package Search Results',
+    %$html_header = ( title => _g( 'Package Search Results' ) ,
+		      lang => $opts->{lang},
+		      title_tag => _g( 'Debian Package Search Results' ),
 		      print_title => 1,
 		      print_search_field => 'packages',
 		      search_field_values => { 
@@ -164,22 +168,15 @@ sub do_search {
 		
 		my ($pkg) = $pkg_t =~ m/^(.+)/; # untaint
 		if ($arch ne 'virtual') {
-		    my $real_archive;
-		    if ($archive =~ /^(security|non-US)$/) {
-			$real_archive = $archive;
-			$archive = 'us';
-		    }
-
-		    $pkgs{$pkg}{$suite}{$archive}{$version}{$arch} = 1;
-		    $subsect{$pkg}{$suite}{$archive}{$version} = $subsection;
-		    $sect{$pkg}{$suite}{$archive}{$version} = $section
+		    $pkgs{$pkg}{$suite}{$version}{$arch} = 1;
+		    $subsect{$pkg}{$suite}{$version} = $subsection;
+		    $sect{$pkg}{$suite}{$version} = $section
 			unless $section eq 'main';
-		    $archives{$pkg}{$suite}{$archive}{$version} = $real_archive
-			if $real_archive;
+		    $archives{$pkg}{$suite}{$version} = $archive;
 		    
-		    $desc{$pkg}{$suite}{$archive}{$version} = $desc;
+		    $desc{$pkg}{$suite}{$version} = $desc;
 		} else {
-		    $provided_by{$pkg}{$suite}{$archive} = [ split /\s+/, $desc ];
+		    $provided_by{$pkg}{$suite} = [ split /\s+/, $desc ];
 		}
 	    }
 
@@ -227,20 +224,21 @@ sub print_packages {
 
     #my ($start, $end) = multipageheader( $input, scalar @pkgs, \%opts );
     my $str = '<div id="psearchres">';
-    $str .= "<p>Found <em>".(scalar @$pkgs_list)."</em> matching packages.";
+    $str .= "<p>".sprintf( _g( "Found <em>%s</em> matching packages." ),
+			   scalar @$pkgs_list )."</p>";
     #my $count = 0;
 	    
     my $have_exact;
     if (grep { $_ eq $keyword } @$pkgs_list) {
 	$have_exact = 1;
-	$str .= '<h2>Exact hits</h2>';
+	$str .= '<h2>'._g( "Exact hits" ).'</h2>';
 	$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 .= '<h2>Other hits</h2>'
+	$str .= '<h2>'._g( 'Other hits' ).'</h2>'
 	    if $have_exact;
 	
 	foreach my $pkg (@$pkgs_list) {
@@ -250,8 +248,9 @@ sub print_packages {
 				  map { $_->{$pkg}||{} } @func_args );
 	}
     } elsif (@$pkgs_list) {
-	$str .= "<p><a href=\"".encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}")."\">".
-	    ($#{$pkgs_list}+1)."</a> results have not been displayed because you requested only exact matches.</p>";
+	$str .= "<p>".sprintf( _g( '<a href="%s">%s</a> results have not been displayed because you requested only exact matches.' ),
+			       encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}"),
+			       scalar @$pkgs_list )."</p>";
     }
     $str .= '</div>';
 
@@ -261,48 +260,44 @@ sub print_packages {
 sub print_package {
     my ($pkg, $pkgs, $provided_by, $archives, $sect, $subsect, $desc) = @_;
 
-    my $str = sprintf "<h3>Package %s</h3>\n", $pkg;
-    $str .= "<ul>\n";
+    my $str = '<h3>'.sprintf( _g( 'Package %s' ), $pkg ).'</h3>';
+    $str .= '<ul>';
     foreach my $suite (@SUITES) {
-	foreach my $archive (@ARCHIVES) {
-	    next if $archive eq 'security';
-	    next if $archive eq 'non-US';
-	    my $path = $suite.(($archive ne 'us')?"/$archive":'');
-	    if (exists $pkgs->{$suite}{$archive}) {
+	    my $path = $suite;
+	    if (exists $pkgs->{$suite}) {
 		my %archs_printed;
-		my @versions = version_sort keys %{$pkgs->{$suite}{$archive}};
+		my @versions = version_sort keys %{$pkgs->{$suite}};
 		my $origin_str = "";
-		if ($sect->{$suite}{$archive}{$versions[0]}) {
-		    $origin_str .= " ".marker($sect->{$suite}{$archive}{$versions[0]});
+		if ($sect->{$suite}{$versions[0]}) {
+		    $origin_str .= " ".marker($sect->{$suite}{$versions[0]});
 		}
 		$str .= sprintf( "<li><a href=\"$ROOT/%s/%s\">%s</a> (%s): %s   %s\n",
-				 $path, $pkg, $path, $subsect->{$suite}{$archive}{$versions[0]},
-				 $desc->{$suite}{$archive}{$versions[0]}, $origin_str );
+				 $path, $pkg, $path, $subsect->{$suite}{$versions[0]},
+				 $desc->{$suite}{$versions[0]}, $origin_str );
 		
 		foreach my $v (@versions) {
 		    my $archive_str = "";
-		    if ($archives->{$suite}{$archive}{$v}) {
-			$archive_str .= " ".marker($archives->{$suite}{$archive}{$v});
+		    if ($archives->{$suite}{$v} ne 'us') {
+			$archive_str .= " ".marker($archives->{$suite}{$v});
 		    }
 		    
-		    my @archs_to_print = grep { !$archs_printed{$_} } sort keys %{$pkgs->{$suite}{$archive}{$v}};
+		    my @archs_to_print = grep { !$archs_printed{$_} } sort keys %{$pkgs->{$suite}{$v}};
 		    $str .= sprintf( "<br>%s$archive_str: %s\n",
 				     $v, join (" ", @archs_to_print ))
 			if @archs_to_print;
 		    $archs_printed{$_}++ foreach @archs_to_print;
 		}
-		if (my $p =  $provided_by->{$suite}{$archive}) {
-		    $str .= '<br>also provided by: '.
+		if (my $p =  $provided_by->{$suite}) {
+		    $str .= '<br>'._g( 'also provided by: ' ).
 			join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>"  } @$p);
 		}
 		$str .= "</li>\n";
-	    } elsif (my $p =  $provided_by->{$suite}{$archive}) {
+	    } elsif (my $p =  $provided_by->{$suite}) {
 		$str .= sprintf( "<li><a href=\"$ROOT/%s/%s\">%s</a>: Virtual package<br>",
 				 $path, $pkg, $path );
-		$str .= 'provided by: '.
+		$str .= _g( 'provided by: ' ).
 		    join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>"  } @$p);
 	    }
-	}
     }
     $str .= "</ul>\n";
     return $str;
@@ -311,7 +306,7 @@ sub print_package {
 sub print_src_package {
     my ($pkg, $pkgs, $archives, $sect, $subsect, $binaries) = @_;
 
-    my $str = sprintf "<h3>Source package %s</h3>\n", $pkg;
+    my $str = '<h3>'.sprintf( _g( 'Source package %s' ), $pkg ).'</h3>';
     $str .= "<ul>\n";
     foreach my $suite (@SUITES) {
 	foreach my $archive (@ARCHIVES) {
@@ -327,7 +322,7 @@ sub print_src_package {
 				 $suite.(($archive ne 'us')?"/$archive":''), $pkg, $suite.(($archive ne 'us')?"/$archive":''), $subsect->{$suite}{$archive}{source},
 				 $pkgs->{$suite}{$archive}, $origin_str );
 		
-		$str .= "<br>Binary packages: ";
+		$str .= "<br>"._g( 'Binary packages: ' );
 		my @bp_links;
 		foreach my $bp (@{$binaries->{$suite}{$archive}}) {
 		    my $bp_link = sprintf( "<a href=\"$ROOT/%s/%s\">%s</a>",