X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/c836425c17caf9f22601088f6133526d01990f9d..ce2e13e64bf9de995020cf18fd7ef36f199f018d:/SL/Locale.pm diff --git a/SL/Locale.pm b/SL/Locale.pm index 5454e74c5..f797ed6e6 100644 --- a/SL/Locale.pm +++ b/SL/Locale.pm @@ -70,10 +70,11 @@ sub new { $self->{charset} = Common::DEFAULT_CHARSET; } - my $db_charset = $main::dbcharset; - $db_charset ||= Common::DEFAULT_CHARSET; - $self->{iconv} = Text::Iconv->new($self->{charset}, $db_charset); - $self->{iconv_english} = Text::Iconv->new("ASCII", $db_charset); + my $db_charset = $main::dbcharset || Common::DEFAULT_CHARSET; + + $self->{iconv} = Text::Iconv->new($self->{charset}, $db_charset); + $self->{iconv_english} = Text::Iconv->new('ASCII', $db_charset); + $self->{iconv_iso8859} = Text::Iconv->new('ISO-8859-15', $db_charset); } $self->{NLS_file} = $NLS_file;