summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>1999-12-02 16:37:49 +0000
committerPablo Saratxaga <pablo@mandriva.com>1999-12-02 16:37:49 +0000
commitd615013bc0861ee1a78e81063facacd77f5a792e (patch)
tree6bdce83c750cb67c6d1d04dec1bd0e0df423ff20
parentf0cee665246a89d69530d4100da0274d56b8f5ec (diff)
downloaddrakx-d615013bc0861ee1a78e81063facacd77f5a792e.tar
drakx-d615013bc0861ee1a78e81063facacd77f5a792e.tar.gz
drakx-d615013bc0861ee1a78e81063facacd77f5a792e.tar.bz2
drakx-d615013bc0861ee1a78e81063facacd77f5a792e.tar.xz
drakx-d615013bc0861ee1a78e81063facacd77f5a792e.zip
allow use of locale names wider than two char (needed for chinese)
-rw-r--r--perl-install/common.pm3
-rw-r--r--perl-install/lang.pm2
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 11f5f9b97..5a1a722c1 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -244,7 +244,8 @@ sub unmakedev { $_[0] >> 8, $_[0] & 0xff }
sub translate {
my ($s) = @_;
- my ($lang) = substr($ENV{LANGUAGE} || $ENV{LC_MESSAGES} || $ENV{LC_ALL} || $ENV{LANG} || 'en', 0, 2);
+#- $ENV{LANG} in first place until load_po can handle multiple locales
+ my ($lang) = $ENV{LANG} || $ENV{LANGUAGE} || $ENV{LC_MESSAGES} || $ENV{LC_ALL} || $ENV{LANG} || 'en';
require 'lang.pm';
lang::load_po ($lang) unless defined $po::I18N::{$lang}; #- the space if needed to mislead perl2fcalls (as lang is not included here)
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 27054b8db..ecb7d7dd1 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -189,7 +189,7 @@ sub load_po($) {
$s .= "package po::I18N;\n";
$s .= "\%$lang = (";
- $lang = substr($lang, 0, 2);
+#- $lang = substr($lang, 0, 2);
my $f; -e ($f = "$_/po/$lang.po") and last foreach @INC;
unless (-e $f) {
-e ($f = "$_") and last foreach @INC;