diff options
author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-01-18 16:53:46 +0100 |
---|---|---|
committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-01-18 16:53:46 +0100 |
commit | f774ac89e0bd04b8bb1658937a2e1dd046ce2f88 (patch) | |
tree | a9ef6baacabbff0acc76676851725504b1eaed73 | |
parent | 4431e39d37e37a7c9e40cacb0939ec9bd8aa7766 (diff) | |
download | drakx-f774ac89e0bd04b8bb1658937a2e1dd046ce2f88.tar drakx-f774ac89e0bd04b8bb1658937a2e1dd046ce2f88.tar.gz drakx-f774ac89e0bd04b8bb1658937a2e1dd046ce2f88.tar.bz2 drakx-f774ac89e0bd04b8bb1658937a2e1dd046ce2f88.tar.xz drakx-f774ac89e0bd04b8bb1658937a2e1dd046ce2f88.zip |
fix untranslated button & title in help dialogs (mga#9828)
-rw-r--r-- | perl-install/install/NEWS | 1 | ||||
-rw-r--r-- | perl-install/interactive/gtk.pm | 1 | ||||
-rwxr-xr-x | perl-install/standalone/display_installer_help | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index e4db0aef9..ada2c59dc 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - help dialogs: o make screenshots work (mga#11176) + o fix untranslated button & title (mga#9828) Version 16.23 - 16 January 2014 diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 6b76b7d40..9b989b84f 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -838,6 +838,7 @@ sub display_help { if ($common->{interactive_help}) { output($f, $common->{interactive_help}->()); } + local $ENV{LC_ALL} = $::o->{locale}{lang} || 'C'; system('display_installer_help', $common->{interactive_help_id} || $f, $o->{locale}{lang}); } diff --git a/perl-install/standalone/display_installer_help b/perl-install/standalone/display_installer_help index 165ae6729..2a395daec 100755 --- a/perl-install/standalone/display_installer_help +++ b/perl-install/standalone/display_installer_help @@ -20,6 +20,7 @@ use lib qw(/usr/lib/libDrakX); use interactive; use any; +use lang; # so that screenshots works: use install::any; @@ -32,4 +33,7 @@ any::set_wm_hints_if_needed($in); # Fake enough $o for retrieving the proper translation: $::o = $in; $::o->{locale}{lang} = $ARGV[1]; +$::prefix = '/'; +lang::set($::o->{locale}); + $in->display_help_window({ interactive_help_id => $ARGV[0] }); |