From 7fa65d931c24bd00a7d9ec9b26adaf7ad80023b9 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Sat, 8 Feb 2003 22:09:29 +0000 Subject: language/country selection change: - first install step is selection of your language, in your language; it uses images for that - language->country is probed, the selection of the country is possible if there was a problem, in the Summary step - in the $o big structure, we now use $o->{locale} which contains three keys: lang, country and utf8 - lang.pm has been cleaned and rewritten a bit - keyboard probing now done only on language (because this step is at the beginning of the install) - timezone probing done on country, if use changes country before timezone in the Summary, re-probe timezone accordingly --- perl-install/standalone/drakhelp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'perl-install/standalone/drakhelp') diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp index a6da9f497..a3a0a9653 100644 --- a/perl-install/standalone/drakhelp +++ b/perl-install/standalone/drakhelp @@ -15,11 +15,11 @@ die "Usage: drakhelp " if @ARGV != 1; my $in = interactive->vnew; -my $lang = lang::lang2LANG(lang::read('',$>)) || 'en'; -if (!member($lang, qw(de en es fr it ru))) { $lang = 'en' }; -my $path_to_help = "/usr/share/doc/mandrake/" . $lang . "/"; +my $locale = lang::read('', $>); +if (!member($locale->{lang}, qw(de en es fr it ru))) { $locale->{lang} = 'en' }; +my $path_to_help = "/usr/share/doc/mandrake/" . $locale->{lang} . "/"; --d $path_to_help or $in->do_pkgs->install('mandrake_doc-drakxtools-' . $lang); +-d $path_to_help or $in->do_pkgs->install('mandrake_doc-drakxtools-' . $locale->{lang}); if ((my $wm = any::running_window_manager()) eq 'kwin') { system("mdklaunchhelp " . $path_to_help . $ARGV[0] . "&"); -- cgit v1.2.1