summaryrefslogtreecommitdiffstats
path: root/perl-install/interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-13 14:35:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-13 14:35:52 +0000
commitfe57c63558450228ca52c6f3302910372be6ebb4 (patch)
treecba149bbace96874d5e4831b24c29621c7c7b1cd /perl-install/interactive.pm
parent39824973bc990aabe121d812abfc3467df8be98a (diff)
downloaddrakx-fe57c63558450228ca52c6f3302910372be6ebb4.tar
drakx-fe57c63558450228ca52c6f3302910372be6ebb4.tar.gz
drakx-fe57c63558450228ca52c6f3302910372be6ebb4.tar.bz2
drakx-fe57c63558450228ca52c6f3302910372be6ebb4.tar.xz
drakx-fe57c63558450228ca52c6f3302910372be6ebb4.zip
- set_help is deprecated
- it is replaced by interactive_help_id on each ask_* - many set_help do not have any correspondance in help.pm (drakxid-*), those are commented for now
Diffstat (limited to 'perl-install/interactive.pm')
-rw-r--r--perl-install/interactive.pm9
1 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 53915ca61..f812ecba5 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -365,6 +365,7 @@ sub ask_from_normalize {
($common->{title} = $0) =~ s|.*/||;
}
$common->{interactive_help} ||= $o->{interactive_help};
+ $common->{interactive_help} ||= $common->{interactive_help_id} && sub { $o->interactive_help_get_id($common->{interactive_help_id}) };
$common->{advanced_label} ||= N("Advanced");
$common->{advanced_label_close} ||= N("Basic");
$common->{$_} = [ deref($common->{$_}) ] foreach qw(messages advanced_messages);
@@ -394,6 +395,7 @@ sub ask_from_real {
sub ask_browse_tree_info {
my ($o, $title, $message, $common) = @_;
+ $common->{interactive_help} ||= $common->{interactive_help_id} && sub { $o->interactive_help_get_id($common->{interactive_help_id}) };
add2hash_($common, { ok => N("Ok"), cancel => N("Cancel") });
add2hash_($common, { title => $title, message => $message });
add2hash_($common, { grep_allowed_to_toggle => sub { @_ },
@@ -468,4 +470,11 @@ sub helper_separator_tree_to_tree {
}
+sub interactive_help_get_id {
+ my @l = map {
+ join("\n\n", map { s/\n/ /mg; $_ } split("\n\n", translate($help::steps{$_})))
+ } grep { exists $help::steps{$_} } @_;
+ join("\n\n\n", @l);
+}
+
1;