summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-08-21 16:32:10 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-08-21 16:32:10 +0000
commit61a74ac6e678b40f43e748dbe631a1fe2cc9480d (patch)
tree455ea426268337b3b35d51150678ac66afc2da45
parent9b3d10be3d0d3479d5b361d68f8b0126af2c526e (diff)
downloaddrakx-61a74ac6e678b40f43e748dbe631a1fe2cc9480d.tar
drakx-61a74ac6e678b40f43e748dbe631a1fe2cc9480d.tar.gz
drakx-61a74ac6e678b40f43e748dbe631a1fe2cc9480d.tar.bz2
drakx-61a74ac6e678b40f43e748dbe631a1fe2cc9480d.tar.xz
drakx-61a74ac6e678b40f43e748dbe631a1fe2cc9480d.zip
move ugtk2 related language fixes into ugtk2 jail
-rw-r--r--perl-install/standalone.pm2
-rw-r--r--perl-install/ugtk2.pm3
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index c035019cc..bc78debea 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -4,7 +4,6 @@ use c;
use strict;
use common qw(N N_ if_);
use Config;
-use lang;
#- for sanity (if a use standalone is made during install, MANY problems will happen)
require 'log.pm'; #- "require log" causes some pb, perl thinking that "log" is the log() function
@@ -139,7 +138,6 @@ foreach (@ARGV) {
@ARGV = @new_ARGV;
-$::o = { locale => { lang => lang::read()->{lang} } };
sub version {
print STDERR "Drakxtools version 9.1.0
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index c20888cdb..4e251bd10 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -3,6 +3,9 @@ package ugtk2;
use diagnostics;
use strict;
use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @icon_paths $force_center $force_focus $force_position $grab $pop_it $border); #- leave it on one line, for automatic removal of the line at package creation
+use lang;
+
+$::o = { locale => lang::read() } if !$::isInstall;
@ISA = qw(Exporter);
%EXPORT_TAGS = (