From 148485ac164383aa702a68933e9cf796fbf0579b Mon Sep 17 00:00:00 2001
From: Arnaud Desmons <adesmons@mandriva.com>
Date: Tue, 13 Aug 2002 13:43:40 +0000
Subject: \n replacement and some minor changes

---
 drakwizard.pl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'drakwizard.pl')

diff --git a/drakwizard.pl b/drakwizard.pl
index da42865d..7a19d16d 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -32,8 +32,8 @@ use POSIX;
 use Locale::gettext();
 
 #- I18N.
-setlocale (LC_ALL, "");
-Locale::gettext::textdomain ("drakwizard");
+setlocale(LC_ALL, "");
+Locale::gettext::textdomain("drakwizard");
 
 sub translate {
     my ($format, @params) = @_;
@@ -100,6 +100,7 @@ sub get_parameter {
 			       $page->{info} =~ s/\\\'/\'/g;
 			       $page->{info} =~ s/\\q/\"/g;
 			       $page->{info} =~ s/\\a/\&/g;
+			       $page->{info} =~ s/\\n/\n/g;
 			   },
 			   Freetext => $common_freetext_chooser = sub {
 			       push @{$page->{freetext}}, { %$leaf, main_order => 
@@ -182,7 +183,7 @@ sub display {
 	    foreach(@{$page->{freetext}}) {
 		if($_->{main_order} eq 'bool'){
 		    $ENV{$variable{$_->{variableName}}} = $ENV{$variable{$_->{variableName}}} ? 1 : 0;
-		    $bitfield{$variable{$_->{variableName}}} = $ENV{$variable{$_->{variableName}}} ? "enabled" : "disabled";
+		    $bitfield{$variable{$_->{variableName}}} = $ENV{$variable{$_->{variableName}}} ? translate("enabled") : translate("disabled");
 		}
 		$ENV{$chooser_var} = $chooser_hash{$ENV{$chooser_var}};
 	    }
@@ -199,7 +200,7 @@ sub navigation {
     my ($next, $prev) = do {
 	if (defined $perl_module_name && $page->{func}) {
 	    @func_arg = split(/\s/, $page->{func});
-	    $modStatus = $::{$perl_module_name."::"}{"$func_arg[0]"}->($func_arg[1]);
+	    $modStatus = $::{$perl_module_name."::"}{"$func_arg[0]"}->();
 	    if ($page->{Target}->{jumpIndex}) {
 		find_page($o, $page->{Target}->{jumpIndex}->{int($modStatus)}), $page;		
 	    }
@@ -247,5 +248,5 @@ $::Wizard_pix_up = "wiz_drakconnect.png";
 $::direct = /-direct/;
 $::Wizard_no_previous = 1;
 $::isWizard = 1;
-eval { navigation($o, $o->[0]); };
+navigation($o, $o->[0]);
 $in->exit;
-- 
cgit v1.2.1