Restore translation support in the Perl modules

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

diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index 31e110d5449afbd6cc60367475d14725e4d8800c..1aa67f1d327bf3f10a5e7da9730a628320862f8b 100644 (file)
--- a/lib/Packages/DoSearch.pm
+++ b/lib/Packages/DoSearch.pm
@@ -18,14 +18,15 @@ use Packages::Config qw( $DBDIR @SUITES @ARCHIVES $ROOT );
 
 sub do_search {
     my ($params, $opts, $page_content) = @_;
+    my $cat = $opts->{cat};
 
     $Params::Search::too_many_hits = 0;
 
     if ($params->{errors}{keywords}) {
-       fatal_error( _g( "keyword not valid or missing" ) );
+       fatal_error( $cat->g( "keyword not valid or missing" ) );
        $opts->{keywords} = [];
     } elsif (grep { length($_) < 2 } @{$opts->{keywords}}) {
-       fatal_error( _g( "keyword too short (keywords need to have at least two characters)" ) );
+       fatal_error( $cat->g( "keyword too short (keywords need to have at least two characters)" ) );
     }
 
     my @keywords = @{$opts->{keywords}};
@@ -110,7 +111,8 @@ sub do_search {
            } else {
                @pkgs = sort { $sort_by_relevance{$a} <=> $sort_by_relevance{$b} } keys %uniq_pkgs;
            }
-           process_packages( $page_content, 'packages', \%pkgs, \@pkgs, $opts, \@keywords,
+           process_packages( $page_content, 'packages', \%pkgs, \@pkgs,
+                             $opts, \@keywords,
                              \&process_package, \%provided_by,
                              \%archives, \%sect, \%subsect,
                              \%desc );
@@ -141,7 +143,8 @@ sub do_search {
            }
 
            my @pkgs = sort keys %pkgs;
-           process_packages( $page_content, 'src_packages', \%pkgs, \@pkgs, $opts, \@keywords,
+           process_packages( $page_content, 'src_packages', \%pkgs, \@pkgs,
+                             $opts, \@keywords,
                              \&process_src_package, \%archives,
                              \%sect, \%subsect, \%binaries );
        } # else unless $opts->{source}
@@ -160,20 +163,21 @@ sub process_packages {
     my $have_exact;
     if ($keyword && grep { $_ eq $keyword } @$pkgs_list) {
        $have_exact = 1;
-       $categories[0]{name} = _g( "Exact hits" );
+       $categories[0]{name} = $opts->{cat}->g( "Exact hits" );
 
-       $categories[0]{$target} = [ &$print_func( $keyword, $pkgs->{$keyword}||{},
-                                                  map { $_->{$keyword}||{} } @func_args ) ];
+       $categories[0]{$target} = [ &$print_func( $opts, $keyword,
+                                                 $pkgs->{$keyword}||{},
+                                                 map { $_->{$keyword}||{} } @func_args ) ];
        @$pkgs_list = grep { $_ ne $keyword } @$pkgs_list;
     }
            
     if (@$pkgs_list && (($opts->{searchon} ne 'names') || !$opts->{exact})) {
        my %cat;
-       $cat{name} = _g( 'Other hits' ) if $have_exact;
+       $cat{name} = $opts->{cat}->g( 'Other hits' ) if $have_exact;
        
        $cat{packages} = [];
        foreach my $pkg (@$pkgs_list) {
-           push @{$cat{$target}}, &$print_func( $pkg, $pkgs->{$pkg}||{},
+           push @{$cat{$target}}, &$print_func( $opts, $pkg, $pkgs->{$pkg}||{},
                                                 map { $_->{$pkg}||{} } @func_args );
        }
        push @categories, \%cat;
@@ -185,7 +189,8 @@ sub process_packages {
 }
 
 sub process_package {
-    my ($pkg, $pkgs, $provided_by, $archives, $sect, $subsect, $desc) = @_;
+    my ($opts, $pkg, $pkgs, $provided_by,
+       $archives, $sect, $subsect, $desc) = @_;
 
     my %pkg = ( pkg => $pkg,
                suites => [] );
@@ -227,7 +232,7 @@ sub process_package {
                $suite{providers} = $p;
            }
        } elsif (my $p =  $provided_by->{$suite}) {
-           $suite{desc} = _g('Virtual package');
+           $suite{desc} = $opts->{cat}->g('Virtual package');
            $suite{providers} = $p;
        }
        push @{$pkg{suites}}, \%suite if $suite{versions} || $suite{providers};
@@ -237,7 +242,7 @@ sub process_package {
 }
 
 sub process_src_package {
-    my ($pkg, $pkgs, $archives, $sect, $subsect, $binaries) = @_;
+    my ($opts, $pkg, $pkgs, $archives, $sect, $subsect, $binaries) = @_;
 
     my %pkg = ( pkg => $pkg,
                origins => [] );