X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=24131378fb4d01739f3c92e4536f950abcd5d387;hb=07b14d1f5c08e87ac700564520bc70e1c1ea1923;hp=c45a1a1f145139ff2c61aead0fce1f08b9af561f;hpb=f9c7abfae65b79945beb7e9260942bc94876248a;p=kivitendo-erp.git

diff --git a/SL/Locale.pm b/SL/Locale.pm
index c45a1a1f1..24131378f 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";
@@ -227,6 +227,18 @@ sub text {
   return $text;
 }
 
+sub lang_to_locale {
+  my ($self, $requested_lang) = @_;
+
+  my $requested_locale;
+  $requested_locale = 'de' if $requested_lang =~ m/^_(de|deu|ger)/i;
+  $requested_locale = 'en' if $requested_lang =~ m/^_(en|uk|us|gr)/i;
+  $requested_locale = 'fr' if $requested_lang =~ m/^_fr/i;
+  $requested_locale ||= 'de';
+
+  return $requested_locale;
+}
+
 sub findsub {
   $main::lxdebug->enter_sub();
 
@@ -340,13 +352,13 @@ sub date {
 }
 
 sub parse_date {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my ($self, $myconfig, $date, $longformat) = @_;
   my ($spc, $yy, $mm, $dd);
 
   unless ($date) {
-    $main::lxdebug->leave_sub();
+    $main::lxdebug->leave_sub(2);
     return ();
   }
 
@@ -373,7 +385,7 @@ sub parse_date {
   $yy = ($yy < 70) ? $yy + 2000 : $yy;
   $yy = ($yy >= 70 && $yy <= 99) ? $yy + 1900 : $yy;
 
-  $main::lxdebug->leave_sub();
+  $main::lxdebug->leave_sub(2);
   return ($yy, $mm, $dd);
 }
 
@@ -385,11 +397,11 @@ sub parse_date_to_object {
 }
 
 sub reformat_date {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my ($self, $myconfig, $date, $output_format, $longformat) = @_;
 
-  $main::lxdebug->leave_sub() and return "" unless ($date);
+  $main::lxdebug->leave_sub(2) and return "" unless ($date);
 
   my ($yy, $mm, $dd) = $self->parse_date($myconfig, $date);
 
@@ -404,7 +416,7 @@ sub reformat_date {
   $output_format =~ /y+/;
   substr($output_format, $-[0], $+[0] - $-[0]) = $yy;
 
-  $main::lxdebug->leave_sub();
+  $main::lxdebug->leave_sub(2);
 
   return $output_format;
 }