diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-04-05 11:11:07 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-04-05 11:11:07 +0000 |
| commit | 93f1aa749763ad2b71055f560ee717829f190b69 (patch) | |
| tree | 231fdf7a6a5721edd0fc7499d4a85665275e81eb | |
| parent | 3e4fd91ad5547bdc3933d710100fb9620bd21356 (diff) | |
| download | drakx-93f1aa749763ad2b71055f560ee717829f190b69.tar drakx-93f1aa749763ad2b71055f560ee717829f190b69.tar.gz drakx-93f1aa749763ad2b71055f560ee717829f190b69.tar.bz2 drakx-93f1aa749763ad2b71055f560ee717829f190b69.tar.xz drakx-93f1aa749763ad2b71055f560ee717829f190b69.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/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/interactive/gtk.pm | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/display_installer_help | 2 |
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] }); |