X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=3f7df7e82fe0c9eaf97f4ded65f189734c42485b;hb=89c9ff022d3f13e27ba6bda085df15707fcfb0eb;hp=0668081239d86ae123ad5ba0261cdb88525a6a50;hpb=b32553a3c1bf57303b430d0c68e21fdff854999c;p=kivitendo-erp.git

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 066808123..3f7df7e82 100644
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -36,6 +36,7 @@
 
 package Locale;
 
+use DateTime;
 use Encode;
 use List::Util qw(first);
 use List::MoreUtils qw(any);
@@ -54,7 +55,7 @@ sub new {
 
   my ($type, $country) = @_;
 
-  $country ||= $::language;
+  $country ||= $::lx_office_conf{system}->{language};
   $country   =~ s|.*/||;
   $country   =~ s|\.||g;
 
@@ -95,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";
@@ -108,6 +109,7 @@ sub _init {
   $self->{iconv_english}    = SL::Iconv->new('ASCII',          $db_charset);
   $self->{iconv_iso8859}    = SL::Iconv->new('ISO-8859-15',    $db_charset);
   $self->{iconv_to_iso8859} = SL::Iconv->new($db_charset,      'ISO-8859-15');
+  $self->{iconv_utf8}       = SL::Iconv->new('UTF-8',          $db_charset);
 
   $self->_read_special_chars_file($country);
 
@@ -212,7 +214,7 @@ sub text {
   my $self = shift;
   my $text = shift;
 
-  if (exists $self->{texts}->{$text}) {
+  if ($self->{texts}->{$text}) {
     $text = $self->{iconv}->convert($self->{texts}->{$text});
   } else {
     $text = $self->{iconv_english}->convert($text);
@@ -230,6 +232,7 @@ sub findsub {
 
   my ($self, $text) = @_;
   my $text_rev      = lc $self->{iconv_reverse}->convert($text);
+  $text_rev         =~ s/[\s\-]+/_/g;
 
   if (!$self->{texts_reverse}) {
     $self->{texts_reverse} = { };
@@ -239,6 +242,7 @@ sub findsub {
       $original    =~ s/_+/_/g;
 
       $translation =  lc $translation;
+      $translation =~ s/[\s\-]+/_/g;
 
       $self->{texts_reverse}->{$translation} ||= [ ];
       push @{ $self->{texts_reverse}->{$translation} }, $original;
@@ -373,6 +377,13 @@ sub parse_date {
   return ($yy, $mm, $dd);
 }
 
+sub parse_date_to_object {
+  my $self           = shift;
+  my ($yy, $mm, $dd) = $self->parse_date(@_);
+
+  return $yy && $mm && $dd ? DateTime->new(year => $yy, month => $mm, day => $dd) : undef;
+}
+
 sub reformat_date {
   $main::lxdebug->enter_sub();
 
@@ -401,14 +412,23 @@ sub reformat_date {
 sub format_date {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $yy, $mm, $dd) = @_;
+  my $self     = shift;
+  my $myconfig = shift;
+  my $yy       = shift;
+  my $mm       = shift;
+  my $dd       = shift;
+  my $yy_len   = shift || 4;
+
+  ($yy, $mm, $dd) = ($yy->year, $yy->month, $yy->day) if ref $yy eq 'DateTime';
 
   $main::lxdebug->leave_sub() and return "" unless $yy && $mm && $dd;
 
-  my $format = $myconfig->{dateformat};
+  $yy = $yy % 100 if 2 == $yy_len;
+
+  my $format = ref $myconfig eq '' ? "$myconfig" : $myconfig->{dateformat};
   $format =~ s{ d+ }{ sprintf("%0" . (length($&)) . "d", $dd) }gex;
   $format =~ s{ m+ }{ sprintf("%0" . (length($&)) . "d", $mm) }gex;
-  $format =~ s{ y+ }{ sprintf("%4d",                     $yy) }gex;
+  $format =~ s{ y+ }{ sprintf("%0${yy_len}d",            $yy) }gex;
 
   $main::lxdebug->leave_sub();
 
@@ -444,14 +464,43 @@ sub remap_special_chars {
   return $self->quote_special_chars($dst_format, $self->quote_special_chars("${src_format}-reverse", shift));
 }
 
+sub raw_io_active {
+  my $self = shift;
+
+  return !!$self->{raw_io_active};
+}
+
 sub with_raw_io {
   my $self = shift;
   my $fh   = shift;
   my $code = shift;
 
+  $self->{raw_io_active} = 1;
   binmode $fh, ":raw";
   $code->();
   binmode $fh, ":utf8" if $self->is_utf8;
+  $self->{raw_io_active} = 0;
+}
+
+sub set_numberformat_wo_thousands_separator {
+  my $self     = shift;
+  my $myconfig = shift || \%::myconfig;
+
+  $self->{saved_numberformat} = $myconfig->{numberformat};
+  $myconfig->{numberformat}   =~ s/^1[,\.]/1/;
+}
+
+sub restore_numberformat {
+  my $self     = shift;
+  my $myconfig = shift || \%::myconfig;
+
+  $myconfig->{numberformat} = $self->{saved_numberformat} if $self->{saved_numberformat};
+}
+
+sub get_local_time_zone {
+  my $self = shift;
+  $self->{local_time_zone} ||= DateTime::TimeZone->new(name => 'local');
+  return $self->{local_time_zone};
 }
 
 1;