From: Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
Date: Wed, 22 Feb 2006 01:51:14 +0000 (+0000)
Subject: Use _g instead of gettext, the former works, the latter doesn't
X-Git-Tag: switch-to-templates~78
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=a4e6ac9c039c1af7b853b8b3a616035b83f1bfd9;p=deb%2Fpackages.git

Use _g instead of gettext, the former works, the latter doesn't
---

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 4588235..a11c11b 100644
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -23,15 +23,15 @@ sub do_search_contents {
     my ($params, $opts, $html_header, $menu, $page_content) = @_;
 
     if ($params->{errors}{keywords}) {
-	fatal_error( gettext( "keyword not valid or missing" ) );
+	fatal_error( _g( "keyword not valid or missing" ) );
     } elsif (length($opts->{keywords}) < 2) {
-	fatal_error( gettext( "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)" ) );
     }
     if ($params->{errors}{suite}) {
-	fatal_error( gettext( "suite not valid or not specified" ) );
+	fatal_error( _g( "suite not valid or not specified" ) );
     }
     if (@{$opts->{suite}} > 1) {
-	fatal_error( sprintf( gettext( "more than one suite specified for contents search (%s)" ), "@{$opts->{suite}}" ) );
+	fatal_error( sprintf( _g( "more than one suite specified for contents search (%s)" ), "@{$opts->{suite}}" ) );
     }
 
     $$menu = "";
@@ -75,7 +75,7 @@ sub do_search_contents {
 	    open FILENAMES, '-|', 'fgrep', '--', $kw, "$DBDIR/contents/filenames_$suite.txt"
 		or die "Failed opening filename table: $!";
 
-	    error( gettext( "Exact and fullfilenamesearch don't go along" ) )
+	    error( _g( "Exact and fullfilenamesearch don't go along" ) )
 		if $ffn and $exact;
 
 	    while (<FILENAMES>) {
@@ -113,16 +113,16 @@ sub do_search_contents {
     msg( "You have searched for ${wording} <em>$keyword_enc</em> in $suite_wording, $section_wording, and $arch_wording." );
 
     if ($Packages::Search::too_many_hits) {
-	error( gettext( "Your search was too wide so we will only display only the first about 100 matches. Please consider using a longer keyword or more keywords." ) );
+	error( _g( "Your search was too wide so we will only display only the first about 100 matches. Please consider using a longer keyword or more keywords." ) );
     }
     
     if (!@Packages::CGI::fatal_errors && !@results) {
-	error( gettext( "Nothing found" ) );
+	error( _g( "Nothing found" ) );
     }
 
-    %$html_header = ( title => gettext( 'Package Contents Search Results' ),
+    %$html_header = ( title => _g( 'Package Contents Search Results' ),
 		      lang => $opts->{lang},
-		      title_tag => gettext( 'Debian Package Contents Search Results' ),
+		      title_tag => _g( 'Debian Package Contents Search Results' ),
 		      print_title => 1,
 		      print_search_field => 'packages',
 		      search_field_values => { 
@@ -138,9 +138,10 @@ sub do_search_contents {
 
     $$page_content = '';
     if (@results) {
-	$$page_content .= "<p>".sprintf( gettext( 'Found %s results' ),
+	$$page_content .= "<p>".sprintf( _g( 'Found %s results' ),
 					 scalar @results )."</p>";
-	$$page_content .= '<div id="pcontentsres"><table><colgroup><col><col></colgroup><tr><th>'.gettext('File').'</th><th>'.gettext('Packages')
+	$$page_content .= '<div
+	id="pcontentsres"><table><colgroup><col><col></colgroup><tr><th>'._g('File').'</th><th>'._g('Packages')
 	    .'</th></tr>';
 	foreach my $result (sort { $a->[0] cmp $b->[0] } @results) {
 	    my $file = shift @$result;
@@ -153,7 +154,7 @@ sub do_search_contents {
 	    $$page_content .= join( ", ", map { "<a href=\"$ROOT/$suite/$_\">$_</a>" } sort keys %pkgs);
 	    $$page_content .= '</td>';
 	}
-	$$page_content .= '<tr><th>'.gettext('File').'</th><th>'.gettext('Packages').'</th></tr>' if @results > 20;
+	$$page_content .= '<tr><th>'._g('File').'</th><th>'._g('Packages').'</th></tr>' if @results > 20;
 	$$page_content .= '</table></div>';
     }
 } # sub do_search_contents