X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=0b535d74036ca6e52646bffa0996ea517bff3560;hb=dea9aaea2182221d62f88966d9ad8e4f85e3a3d6;hp=0ddcf04510dd038090f159a322caed0a2babba6d;hpb=abbd99fdbe691f0bfc84aac2e76a2296ab808d6a;p=kivitendo-erp.git diff --git a/SL/Locale.pm b/SL/Locale.pm index 0ddcf0451..0b535d740 100644 --- a/SL/Locale.pm +++ b/SL/Locale.pm @@ -85,12 +85,13 @@ sub _init { $self->{charset} = Common::DEFAULT_CHARSET; } - my $db_charset = $main::dbcharset || Common::DEFAULT_CHARSET; + my $db_charset = $main::dbcharset || Common::DEFAULT_CHARSET; - $self->{iconv} = Text::Iconv->new($self->{charset}, $db_charset); - $self->{iconv_reverse} = Text::Iconv->new($db_charset, $self->{charset}); - $self->{iconv_english} = Text::Iconv->new('ASCII', $db_charset); - $self->{iconv_iso8859} = Text::Iconv->new('ISO-8859-15', $db_charset); + $self->{iconv} = Text::Iconv->new($self->{charset}, $db_charset); + $self->{iconv_reverse} = Text::Iconv->new($db_charset, $self->{charset}); + $self->{iconv_english} = Text::Iconv->new('ASCII', $db_charset); + $self->{iconv_iso8859} = Text::Iconv->new('ISO-8859-15', $db_charset); + $self->{iconv_to_iso8859} = Text::Iconv->new($db_charset, 'ISO-8859-15'); $self->_read_special_chars_file($country); }