X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FLocale.pm;h=f797ed6e68bf02a97f5de4bc5817edc59edc2880;hb=83914eeb2e95cdf587565952eef54be59dd58693;hp=5454e74c572db506396b352dc08a2f01ed7c8919;hpb=c836425c17caf9f22601088f6133526d01990f9d;p=kivitendo-erp.git 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;