X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=4fde61654352b5027afef659713c26ef82c2b8b0;hb=d3835e76df74c5bc7f014048303a2845a1d2277e;hp=05f55ce46aacfeff09d814fc6dc412ca02d54525;hpb=5367525b274785435844298fcf299cdd4d1ac2bd;p=kivitendo-erp.git

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 05f55ce46..4fde61654 100644
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -36,15 +36,20 @@
 
 package Locale;
 
-use Text::Iconv;
+use DateTime;
+use Encode;
 use List::Util qw(first);
+use List::MoreUtils qw(any);
 
 use SL::LXDebug;
 use SL::Common;
+use SL::Iconv;
 use SL::Inifile;
 
 use strict;
 
+my %locales_by_country;
+
 sub new {
   $main::lxdebug->enter_sub();
 
@@ -54,14 +59,18 @@ sub new {
   $country   =~ s|.*/||;
   $country   =~ s|\.||g;
 
-  my $self = {};
-  bless $self, $type;
+  if (!$locales_by_country{$country}) {
+    my $self = {};
+    bless $self, $type;
+
+    $self->_init($country);
 
-  $self->_init($country);
+    $locales_by_country{$country} = $self;
+  }
 
   $main::lxdebug->leave_sub();
 
-  return $self;
+  return $locales_by_country{$country}
 }
 
 sub _init {
@@ -88,12 +97,18 @@ sub _init {
   }
 
   my $db_charset            = $main::dbcharset || Common::DEFAULT_CHARSET;
+  $self->{is_utf8}          = (any { lc($::dbcharset || '') eq $_ } qw(utf8 utf-8 unicode)) ? 1 : 0;
+
+  if ($self->{is_utf8}) {
+    binmode STDOUT, ":utf8";
+    binmode STDERR, ":utf8";
+  }
 
-  $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->{iconv}            = SL::Iconv->new($self->{charset}, $db_charset);
+  $self->{iconv_reverse}    = SL::Iconv->new($db_charset,      $self->{charset});
+  $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->_read_special_chars_file($country);
 
@@ -105,6 +120,12 @@ sub _init {
     (qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec));
 }
 
+sub is_utf8 {
+  my $self   = shift;
+  my $handle = shift;
+  return $self->{is_utf8} && (!$handle || $handle->is_utf8);
+}
+
 sub _handle_markup {
   my $self    = shift;
   my $str     = shift;
@@ -192,7 +213,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);
@@ -219,14 +240,16 @@ sub findsub {
       $original    =~ s/_+/_/g;
 
       $translation =  lc $translation;
+      $translation =~ s/\s+/_/g;
 
       $self->{texts_reverse}->{$translation} ||= [ ];
       push @{ $self->{texts_reverse}->{$translation} }, $original;
     }
   }
 
-  my $sub_name   = first { defined &{ "::$_" } } @{ $self->{texts_reverse}->{$text_rev} } if $self->{texts_reverse}->{$text_rev};
-  $sub_name    ||= $text_rev if ($text_rev =~ m/^[a-z][a-z0-9_]+$/) && defined &{ "::$text_rev" };
+  my $sub_name;
+  $sub_name   = first { defined(&{ "::${_}" }) } @{ $self->{texts_reverse}->{$text_rev} } if $self->{texts_reverse}->{$text_rev};
+  $sub_name ||= $text_rev if ($text_rev =~ m/^[a-z][a-z0-9_]+$/) && defined &{ "::${text_rev}" };
 
   $main::form->error("$text not defined in locale/$self->{countrycode}/all") if !$sub_name;
 
@@ -352,6 +375,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();
 
@@ -377,6 +407,32 @@ sub reformat_date {
   return $output_format;
 }
 
+sub format_date {
+  $main::lxdebug->enter_sub();
+
+  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;
+
+  $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("%0${yy_len}d",            $yy) }gex;
+
+  $main::lxdebug->leave_sub();
+
+  return $format;
+}
+
 sub quote_special_chars {
   my $self   = shift;
   my $format = lc shift;
@@ -406,4 +462,22 @@ 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;
+}
+
 1;