X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=3f7df7e82fe0c9eaf97f4ded65f189734c42485b;hb=1c385c602908735c3be266b1470b301050650fd3;hp=c45a1a1f145139ff2c61aead0fce1f08b9af561f;hpb=f3288b9cb4e09eac31d5a80f22063606e9a7b75d;p=kivitendo-erp.git

diff --git a/SL/Locale.pm b/SL/Locale.pm
index c45a1a1f1..3f7df7e82 100644
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -55,7 +55,7 @@ sub new {
 
   my ($type, $country) = @_;
 
-  $country ||= $::language;
+  $country ||= $::lx_office_conf{system}->{language};
   $country   =~ s|.*/||;
   $country   =~ s|\.||g;
 
@@ -96,8 +96,8 @@ sub _init {
     }
   }
 
-  my $db_charset            = $main::dbcharset || Common::DEFAULT_CHARSET;
-  $self->{is_utf8}          = (any { lc($::dbcharset || '') eq $_ } qw(utf8 utf-8 unicode)) ? 1 : 0;
+  my $db_charset            = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
+  $self->{is_utf8}          = (any { lc($::lx_office_conf{system}->{dbcharset} || '') eq $_ } qw(utf8 utf-8 unicode)) ? 1 : 0;
 
   if ($self->{is_utf8}) {
     binmode STDOUT, ":utf8";