summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-05 11:11:07 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-05 11:11:07 +0000
commita0e3a55d1be4c8031797899696dae90a4a23256d (patch)
tree231fdf7a6a5721edd0fc7499d4a85665275e81eb
parent263e26a9f60d22f5828a560629a8e1ab2abbb569 (diff)
downloaddrakx-backup-do-not-use-a0e3a55d1be4c8031797899696dae90a4a23256d.tar
drakx-backup-do-not-use-a0e3a55d1be4c8031797899696dae90a4a23256d.tar.gz
drakx-backup-do-not-use-a0e3a55d1be4c8031797899696dae90a4a23256d.tar.bz2
drakx-backup-do-not-use-a0e3a55d1be4c8031797899696dae90a4a23256d.tar.xz
drakx-backup-do-not-use-a0e3a55d1be4c8031797899696dae90a4a23256d.zip
fix finding translated help (mga#9619)
regression introduced in commit r7467 on 2013-04-04: "fork displaying help, thus workarounding a webkit segfault (mga#9124)"
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/interactive/gtk.pm4
-rwxr-xr-xperl-install/standalone/display_installer_help2
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index cc942bbe9..d857ad5b1 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix finding translated help (mga#9619)
+
Version 15.34 - 4 April 2013
- force loading NSS modules (mga#9326)
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index ee6c34bf2..57b15340c 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -833,13 +833,13 @@ sub display_help_window {
}
sub display_help {
- my ($_o, $common) = @_;
+ my ($o, $common) = @_;
# not very safe but we run in a restricted environment anyway:
my $f = '/tmp/help.txt';
if ($common->{interactive_help}) {
output($f, $common->{interactive_help}->());
}
- system('display_installer_help', $common->{interactive_help_id} || $f);
+ system('display_installer_help', $common->{interactive_help_id} || $f, $o->{locale}{lang});
}
sub ask_fromW {
diff --git a/perl-install/standalone/display_installer_help b/perl-install/standalone/display_installer_help
index 8d1a84d8c..09c6bae31 100755
--- a/perl-install/standalone/display_installer_help
+++ b/perl-install/standalone/display_installer_help
@@ -25,4 +25,6 @@ my $in = 'interactive'->vnew('su');
# so that we popup above drakx:
any::set_wm_hints_if_needed($in);
+# Fake enough $o for retrieving the proper translation:
+$o->{locale}{lang} = $ARGV[1];
$in->display_help_window({ interactive_help_id => $ARGV[0] });