From 61a74ac6e678b40f43e748dbe631a1fe2cc9480d Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 21 Aug 2003 16:32:10 +0000
Subject: move ugtk2 related language fixes into ugtk2 jail

---
 perl-install/standalone.pm | 2 --
 perl-install/ugtk2.pm      | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install')

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 = (
-- 
cgit v1.2.1