diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-08-09 03:10:27 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-08-09 03:10:27 +0000 |
| commit | b42262b1e1a30bfd7f09210e1d3b6f0da8ca6734 (patch) | |
| tree | 2fe2de756a5f30a1ed613eee45223555bf7c5e27 /perl-install/lang.pm | |
| parent | 19a10e98f556ee3ce47831364ae45c044329b45f (diff) | |
| download | drakx-b42262b1e1a30bfd7f09210e1d3b6f0da8ca6734.tar drakx-b42262b1e1a30bfd7f09210e1d3b6f0da8ca6734.tar.gz drakx-b42262b1e1a30bfd7f09210e1d3b6f0da8ca6734.tar.bz2 drakx-b42262b1e1a30bfd7f09210e1d3b6f0da8ca6734.tar.xz drakx-b42262b1e1a30bfd7f09210e1d3b6f0da8ca6734.zip | |
we never pass a prefix to lang::read() which is always use in standalone,
so use $::prefix and don't pass a prefix anymore
Diffstat (limited to 'perl-install/lang.pm')
| -rw-r--r-- | perl-install/lang.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 695c37b18..11e0efaa0 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -954,10 +954,9 @@ sub system_locales_to_ourlocale { } sub read { - my ($prefix, $user_only) = @_; - $prefix ||= ""; - my ($f1, $f2) = ("$prefix$ENV{HOME}/.i18n", "$prefix/etc/sysconfig/i18n"); - my %h = getVarsFromSh($user_only && -e $f1 ? $f1 : $f2); + my ($b_user_only) = @_; + my ($f1, $f2) = ("$::prefix$ENV{HOME}/.i18n", "$::prefix/etc/sysconfig/i18n"); + my %h = getVarsFromSh($b_user_only && -e $f1 ? $f1 : $f2); my $locale = system_locales_to_ourlocale($h{LC_MESSAGES} || 'en_US', $h{LC_MONETARY} || 'en_US'); if ($h{XIM_PROGRAM}) { |