diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-01-22 01:58:19 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-01-22 01:58:19 +0100 |
| commit | 0640ea0a3d7b3261546f541a4556240e318b4141 (patch) | |
| tree | de5b9a5c664ce101bbdaf769fb953bf1632cd993 | |
| parent | dc7120917c1d2a6c1d2cb828e4418bda18773553 (diff) | |
| download | drakx-0640ea0a3d7b3261546f541a4556240e318b4141.tar drakx-0640ea0a3d7b3261546f541a4556240e318b4141.tar.gz drakx-0640ea0a3d7b3261546f541a4556240e318b4141.tar.bz2 drakx-0640ea0a3d7b3261546f541a4556240e318b4141.tar.xz drakx-0640ea0a3d7b3261546f541a4556240e318b4141.zip | |
fix untranslated button
| -rw-r--r-- | perl-install/any.pm | 1 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/display_release_notes.pl | 8 |
3 files changed, 12 insertions, 0 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index bcbb990a0..1d5eb104b 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1078,6 +1078,7 @@ sub get_release_notes { sub run_display_release_notes { my ($release_notes) = @_; output('/tmp/release_notes.html', $release_notes); + local $ENV{LC_ALL} = $::o->{locale}{lang} || 'C'; run_program::raw({ detach => 1 }, '/usr/bin/display_release_notes.pl'); } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 11bff0e4f..dd80cdaeb 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- release notes dialog: + o fix untranslated button + Version 16.26.4 - 22 January 2014 - debug image: diff --git a/perl-install/standalone/display_release_notes.pl b/perl-install/standalone/display_release_notes.pl index 4f5f19bb4..f6a2fab1c 100755 --- a/perl-install/standalone/display_release_notes.pl +++ b/perl-install/standalone/display_release_notes.pl @@ -22,11 +22,19 @@ use lib qw(/usr/lib/libDrakX); use interactive; use any; use MDK::Common; +use lang; 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 = $in; +$::o->{locale}{lang} = $ENV{LC_ALL}; +# must have a value so that we look at locale_special/ : +$::prefix = '/'; +lang::set($::o->{locale}); + # not very safe but we run in a restricted environment anyway: my $release_notes = cat_utf8('/tmp/release_notes.html'); any::display_release_notes($in, $release_notes); |