gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 15395: Do not use nl_putenv, use $ENV instead 

nl_putenv is only useful on Windows systems

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Julian Maurice 2018-10-25 11:22:24 +02:00 committed by Nick Clemens
parent 6d6bc705ec
commit 7ada579ae0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Koha/I18N.pm
View File

@ -24,7 +24,7 @@ use C4::Languages;
use C4::Context;
use Encode;
use Locale::Messages qw(:locale_h nl_putenv setlocale LC_MESSAGES);
use Locale::Messages qw(:locale_h setlocale LC_MESSAGES);
use Koha::Cache::Memory::Lite;
use parent 'Exporter';
@ -54,7 +54,7 @@ sub init {
if (@system_locales) {
# LANG needs to be set to a valid locale,
# otherwise LANGUAGE is ignored
nl_putenv('LANG=' . $system_locales[0]);
$ENV{LANG} = $system_locales[0];
setlocale(LC_MESSAGES, '');
my $langtag = C4::Languages::getlanguage;
@ -68,8 +68,8 @@ sub init {
$locale .= '_' . $region;
}
nl_putenv("LANGUAGE=$locale");
nl_putenv('OUTPUT_CHARSET=UTF-8');
$ENV{LANGUAGE} = $locale;
$ENV{OUTPUT_CHARSET} = 'UTF-8';
my $directory = _base_directory();
textdomain($textdomain);