diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-02-26 13:18:02 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-02-26 13:18:02 +0000 |
| commit | 40bbc2cadae437419041044bb3f744f4f3534a43 (patch) | |
| tree | 738248a5ae9e4ed5f881d5c1fa1f7289231f4739 /perl-install | |
| parent | 9be4c6b14504a30160a79ecb8e4384d3f310b25d (diff) | |
| download | drakx-backup-do-not-use-40bbc2cadae437419041044bb3f744f4f3534a43.tar drakx-backup-do-not-use-40bbc2cadae437419041044bb3f744f4f3534a43.tar.gz drakx-backup-do-not-use-40bbc2cadae437419041044bb3f744f4f3534a43.tar.bz2 drakx-backup-do-not-use-40bbc2cadae437419041044bb3f744f4f3534a43.tar.xz drakx-backup-do-not-use-40bbc2cadae437419041044bb3f744f4f3534a43.zip | |
set the locale properly instead of setting the translated messages in the script
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Xconfigurator.pm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 6a263caa5..4d274d2b0 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -698,15 +698,16 @@ sub testFinalConfig { } $::noShadow = 1; - my $message = _("Leaving in %d seconds", 99); #- fake translation of test program. - my $question = _("Is this the correct setting?"); local *F; open F, "|perl 2>/dev/null" or die ''; print F "use lib qw(", join(' ', @INC), ");\n"; print F q{ + use lang; use interactive_gtk; use my_gtk qw(:wrappers); + lang::bindtextdomain(); + $ENV{DISPLAY} = ":9"; gtkset_background(200 * 257, 210 * 257, 210 * 257); @@ -716,9 +717,7 @@ sub testFinalConfig { my $text = Gtk::Label->new; my $time = 8; Gtk->timeout_add(1000, sub { - my $message = "} . $message . q{"; - $message = s/99/$time/; - $text->set($message); + $text->set(_("Leaving in %d seconds", $time)); $time-- or Gtk->main_quit; 1; }); @@ -729,7 +728,7 @@ sub testFinalConfig { system(($::testing ? "} . $prefix . q{" : "chroot } . $prefix . q{/ ") . "$qiv -y $background"); my $in = interactive_gtk->new; - $in->exit($in->ask_yesorno('', [ "} . $question . q{"), $text ], 0) ? 0 : 222); + $in->exit($in->ask_yesorno('', [ _("Is this the correct setting?"), $text ], 0) ? 0 : 222); }; my $rc = close F; my $err = $?; |