Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp

[kivitendo-erp.git] / SL / Locale.pm

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 881d592..3f7df7e 100644 (file)
--- 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";
@@ -109,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);
 
@@ -231,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} = { };
@@ -240,7 +242,7 @@ sub findsub {
       $original    =~ s/_+/_/g;
 
       $translation =  lc $translation;
-      $translation =~ s/\s+/_/g;
+      $translation =~ s/[\s\-]+/_/g;
 
       $self->{texts_reverse}->{$translation} ||= [ ];
       push @{ $self->{texts_reverse}->{$translation} }, $original;
@@ -462,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;