summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2003-07-23 12:55:55 +0000
committerDaouda Lo <daouda@mandriva.com>2003-07-23 12:55:55 +0000
commitfa00bbe656c20cc82af802313af0d229582c2eee (patch)
treecb234c6a4af60c46878a9f4f6a05d3af6d70b9ce
parent910868f725811a582c881fdae45699b1728f5979 (diff)
downloaddrakx-fa00bbe656c20cc82af802313af0d229582c2eee.tar
drakx-fa00bbe656c20cc82af802313af0d229582c2eee.tar.gz
drakx-fa00bbe656c20cc82af802313af0d229582c2eee.tar.bz2
drakx-fa00bbe656c20cc82af802313af0d229582c2eee.tar.xz
drakx-fa00bbe656c20cc82af802313af0d229582c2eee.zip
- ru, de and it have no specific drakxtools help packages. Default to english
- retest $$path to see if the page exists. - don't launch browser unless help page exists.
-rw-r--r--perl-install/standalone/drakhelp6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp
index 592ed097e..d4e9d264d 100644
--- a/perl-install/standalone/drakhelp
+++ b/perl-install/standalone/drakhelp
@@ -16,11 +16,13 @@ die "Usage: drakhelp <help_path>" if @ARGV != 1;
my $in = interactive->vnew;
my $locale = lang::read('', $>);
-$locale->{lang} = 'en' unless member($locale->{lang}, qw(de en es fr it ru));
+printf("lang is %s\n",$locale->{lang});
+$locale->{lang} = 'en' unless member($locale->{lang}, qw(en es fr));
my $path2help = "/usr/share/doc/mandrake/" . $locale->{lang} . "/";
my $path = $ARGV[0] =~ /^http|^www/ ? $ARGV[0] : $path2help . $ARGV[0];
-e $path or $in->do_pkgs->install('mandrake_doc-drakxtools-' . $locale->{lang});
+-e $path or $in->ask_warn('Mandrake Help Center', N("%s cannot be displayed \n. No Help entry of this type\n", $path));
my $wm = any::running_window_manager();
my %launchhelp = (
@@ -32,6 +34,6 @@ my %launchhelp = (
}
);
member($wm, 'kwin', 'gnome-session') or $wm = 'other';
-eval { $launchhelp{$wm}->() };
+-e $path and eval { $launchhelp{$wm}->() };