use of translate

1 files changed, 8 insertions, 8 deletions

diff --git a/drakwizard.pl b/drakwizard.pl
index fd16340a..45fffcac 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -135,14 +135,14 @@ sub get_parameter {
 			   },
 			   Info => sub {
 			       # This is to avoid monospaced text to be interpolated
-			       $leaf->{helpText} = _($leaf->{helpText});
+			       $leaf->{helpText} = translate($leaf->{helpText});
 			       if ($leaf->{fontName} eq "Monospaced") {
 			       	   chomp($leaf->{helpText});
 				   $leaf->{helpText} = $leaf->{helpText} ? "$leaf->{helpText}\n$leaf->{helpText}" : "$leaf->{helpText}\n";
 			       }
 			       $page->{info} = $leaf->{helpText} ? "$page->{info}\n$leaf->{helpText}" : "$page->{info}\n";
 			       if ($leaf->{fillScript}) {
-				   $page->{info} .= `source $lib_script; $leaf->{fillScript}`;
+				   $page->{info} .= translate(`source $lib_script; $leaf->{fillScript}`);
 			       }
 			       # XML compatibility
 			       $page->{info} =~ s/\\\'/\'/g;
@@ -190,13 +190,13 @@ sub display {
     }
     if ($page->{nextFinish} eq 'true') {
         $::Wizard_no_previous = 1;
-        $in->ask_okcancel(_($page->{name}),
-                          _($page->{info})) or quit_global($in, 0);
+        $in->ask_okcancel(translate($page->{name}),
+                          translate($page->{info})) or quit_global($in, 0);
 	die;
     }
     elsif (!$page->{freetext}) {
-	$in->ask_okcancel(_($page->{name}),
-			  _($page->{info})) or navigation($o, $page->{old_page});
+	$in->ask_okcancel(translate($page->{name}),
+			  translate($page->{info})) or navigation($o, $page->{old_page});
     }
     else {
 	my $valeur;
@@ -226,7 +226,7 @@ sub display {
 	    ($_->{main_order} eq 'entry') ? { label => _($_->{helpText}),
 					      val => \$ENV{$variable{$_->{variableName}}}, type => $_->{main_order} } 
 	      : ($_->{main_order} eq 'bool') ? { val => \$ENV{$variable{$_->{variableName}}}, type => $_->{main_order},
-						 text => _($_->{helpText}, advanced => 1) }
+						 text => translate($_->{helpText}) }
 		: ($_->{main_order} eq 'field') ? { val => 
 						    $description{$ENV{$variable{$_->{variableName}}}}? 
 						    $description{$ENV{$variable{$_->{variableName}}}} :
@@ -236,7 +236,7 @@ sub display {
 			list => [@liste], type => $_->{main_order} };
 	} @{$page->{freetext}};
 	if($page->{executionLevel} eq 'NORMAL') {
-	    $in->ask_from(_($page->{name}), _($page->{info}), 
+	    $in->ask_from($page->{name}, translate($page->{info}), 
 			  \@data) or navigation($o, $page->{old_page});
 	    foreach(@{$page->{freetext}}) {
 		if($_->{main_order} eq 'bool') {