summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-06-30 07:46:12 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-06-30 07:46:12 +0000
commit0abb35a840d29f59b4680b87b28c1f8d18b95390 (patch)
tree56a008fe05413e18a7ed465e9107b91a523fd247
parent242b57c08d2e8b093198dac99009ec01837576d8 (diff)
downloaddrakx-backup-do-not-use-0abb35a840d29f59b4680b87b28c1f8d18b95390.tar
drakx-backup-do-not-use-0abb35a840d29f59b4680b87b28c1f8d18b95390.tar.gz
drakx-backup-do-not-use-0abb35a840d29f59b4680b87b28c1f8d18b95390.tar.bz2
drakx-backup-do-not-use-0abb35a840d29f59b4680b87b28c1f8d18b95390.tar.xz
drakx-backup-do-not-use-0abb35a840d29f59b4680b87b28c1f8d18b95390.zip
rename setlocale() as init_setlocale() since it's more meaninfull regarding its purpose
-rw-r--r--perl-install/c/stuff.xs.pl2
-rw-r--r--perl-install/interactive/newt.pm2
-rw-r--r--perl-install/lang.pm2
-rw-r--r--perl-install/standalone.pm2
4 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl
index 977894a57..15c39bf04 100644
--- a/perl-install/c/stuff.xs.pl
+++ b/perl-install/c/stuff.xs.pl
@@ -236,7 +236,7 @@ get_ext2_label(device_name)
RETVAL
void
-setlocale()
+init_setlocale()
CODE:
setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C"); /* otherwise eval "1.5" returns 1 in fr_FR for example */
diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm
index 8bc39b19f..af829b42b 100644
--- a/perl-install/interactive/newt.pm
+++ b/perl-install/interactive/newt.pm
@@ -21,7 +21,7 @@ sub new {
local $ENV{LC_CTYPE} = "en_US.UTF-8";
Newt::Init(1);
}
- c::setlocale();
+ c::init_setlocale();
} else {
Newt::Init(0);
}
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index ce56a60c1..a2b75b463 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1249,7 +1249,7 @@ sub bindtextdomain() {
#- NB: not using $::isInstall to make it work more easily at install and standalone
my $localedir = "$ENV{SHARE_PATH}/locale" . ($::prefix ? "_special" : '');
- c::setlocale();
+ c::init_setlocale();
c::bind_textdomain_codeset('libDrakX', 'UTF-8');
$::need_utf8_i18n = 1;
c::bindtextdomain('libDrakX', $localedir);
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index e0e0b056f..6ecb45b2e 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -15,7 +15,7 @@ $::isStandalone = 1;
$ENV{SHARE_PATH} ||= "/usr/share";
-c::setlocale();
+c::init_setlocale();
c::bindtextdomain('libDrakX', "/usr/share/locale");
$::license = N_("This program is free software; you can redistribute it and/or modify