PE: single-dbh disconnects

[mfinanz.git] / SL / Locale.pm

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 5016900fe29bce569057d5e3d4c95d08173c93d3..8dc95e73c1bc0305540b51f16160d1f4d2b32cde 100644 (file)
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -77,39 +77,42 @@ sub _init {
   my $self     = shift;
   my $country  = shift;
 
   my $self     = shift;
   my $country  = shift;
 

-  $self->{charset}     = Common::DEFAULT_CHARSET;

   $self->{countrycode} = $country;
 
   if ($country && -d "locale/$country") {
   $self->{countrycode} = $country;
 
   if ($country && -d "locale/$country") {

-    local *IN;
-    if (open(IN, "<", "locale/$country/all")) {
-      my $code = join("", <IN>);
+    if (open my $in, "<", "locale/$country/all") {
+      local $/ = undef;
+      my $code = <$in>;

       eval($code);
       eval($code);

-      close(IN);
+      close($in);

     }
 
     }
 

-    if (open IN, "<", "locale/$country/charset") {
-      $self->{charset} = <IN>;
-      close IN;
-
-      chomp $self->{charset};
+    if (-d "locale/$country/more") {
+      opendir my $dh, "locale/$country/more" or die "can't open locale/$country/more: $!";
+      my @files = sort grep -f "locale/$country/more/$_", readdir $dh;
+      close $dh;
+
+      for my $file (@files) {
+        if (open my $in, "<", "locale/$country/more/$file") {
+          local $/ = undef;
+          my $code = <$in>;
+          eval($code);
+          close($in);
+          $self->{texts}{$_} = $self->{more_texts}{$_} for keys %{ $self->{more_texts} };
+        }
+      }

     }
   }
 
     }
   }
 

-  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;
+  binmode STDOUT, ":utf8";
+  binmode STDERR, ":utf8";

 
 

-  if ($self->{is_utf8}) {
-    binmode STDOUT, ":utf8";
-    binmode STDERR, ":utf8";
-  }
-
-  $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->{iconv_utf8}       = SL::Iconv->new('UTF-8',          $db_charset);
+  $self->{iconv}            = SL::Iconv->new('UTF-8',       'UTF-8');
+  $self->{iconv_reverse}    = SL::Iconv->new('UTF-8',       'UTF-8');
+  $self->{iconv_english}    = SL::Iconv->new('ASCII',       'UTF-8');
+  $self->{iconv_iso8859}    = SL::Iconv->new('ISO-8859-15', 'UTF-8');
+  $self->{iconv_to_iso8859} = SL::Iconv->new('UTF-8',       'ISO-8859-15');
+  $self->{iconv_utf8}       = SL::Iconv->new('UTF-8',       'UTF-8');

 
   $self->_read_special_chars_file($country);
 
 
   $self->_read_special_chars_file($country);
 


@@ -121,12 +124,6 @@ sub _init {
     (qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec));
 }
 
     (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;
 sub _handle_markup {
   my $self    = shift;
   my $str     = shift;


@@ -214,6 +211,8 @@ sub text {
   my $self = shift;
   my $text = shift;
 
   my $self = shift;
   my $text = shift;
 

+  return $text->translated if (ref($text) || '') eq 'SL::Locale::String';
+

   if ($self->{texts}->{$text}) {
     $text = $self->{iconv}->convert($self->{texts}->{$text});
   } else {
   if ($self->{texts}->{$text}) {
     $text = $self->{iconv}->convert($self->{texts}->{$text});
   } else {


@@ -326,7 +325,7 @@ sub date {
   } elsif ($myconfig->{dateformat} eq "yyyy-mm-dd") {
 
     # Use German syntax with the ISO date style "yyyy-mm-dd" because
   } elsif ($myconfig->{dateformat} eq "yyyy-mm-dd") {
 
     # Use German syntax with the ISO date style "yyyy-mm-dd" because

-    # Lx-Office is mainly used in Germany or German speaking countries.
+    # kivitendo is mainly used in Germany or German speaking countries.

     if (defined $longformat && $longformat == 0) {
       $mm++;
       $dd = "0$dd" if ($dd < 10);
     if (defined $longformat && $longformat == 0) {
       $mm++;
       $dd = "0$dd" if ($dd < 10);


@@ -381,8 +380,8 @@ sub parse_date {
     ($yy, $mm, $dd) = ($date =~ /(..)(..)(..)/);
   }
 
     ($yy, $mm, $dd) = ($date =~ /(..)(..)(..)/);
   }
 

-  $dd *= 1;
-  $mm *= 1;
+  $_ ||= 0 for ($dd, $mm, $yy);
+  $_ *= 1  for ($dd, $mm, $yy);

   $yy = ($yy < 70) ? $yy + 2000 : $yy;
   $yy = ($yy >= 70 && $yy <= 99) ? $yy + 1900 : $yy;
 
   $yy = ($yy < 70) ? $yy + 2000 : $yy;
   $yy = ($yy >= 70 && $yy <= 99) ? $yy + 1900 : $yy;
 


@@ -391,27 +390,60 @@ sub parse_date {
 }
 
 sub parse_date_to_object {
 }
 
 sub parse_date_to_object {

-  my $self           = shift;
-  my ($yy, $mm, $dd) = $self->parse_date(@_);
+  my ($self, $string, %params) = @_;

 
 

-  return $yy && $mm && $dd ? DateTime->new(year => $yy, month => $mm, day => $dd) : undef;
+  return undef if !defined $string;
+
+  return DateTime->today_local                      if lc($string) eq 'today';
+  return DateTime->today_local->subtract(days => 1) if lc($string) eq 'yesterday';
+
+  $params{dateformat}        ||= $::myconfig{dateformat}   || 'yy-mm-dd';
+  $params{numberformat}      ||= $::myconfig{numberformat} || '1,000.00';
+  my $num_separator            = $params{numberformat} =~ m{,\d+$} ? ',' : '.';
+
+  my ($date_str, $time_str)    = split m{\s+}, $string, 2;
+  my ($yy, $mm, $dd)           = $self->parse_date(\%params, $date_str);
+
+  my ($hour, $minute, $second) = split m/:/, ($time_str || '');
+  $second ||= '0';
+
+  ($second, my $millisecond)   = split quotemeta($num_separator), $second, 2;
+  $_ ||= 0 for ($hour, $minute, $millisecond);
+
+  $millisecond                 = substr $millisecond, 0, 3;
+  $millisecond                .= '0' x (3 - length $millisecond);
+
+  return undef unless $yy && $mm && $dd;
+  return DateTime->new(year => $yy, month => $mm, day => $dd, hour => $hour * 1, minute => $minute * 1, second => $second * 1, nanosecond => $millisecond * 1000000);
+}
+
+sub format_date_object_to_time {
+  my ($self, $datetime, %params) = @_;
+
+  my $format =  $::myconfig{timeformat} || 'hh:mm';
+  $format    =~ s/hh/\%H/;
+  $format    =~ s/mm/\%M/;
+  $format    =~ s/ss/\%S/;
+
+  return $datetime->strftime($format);

 }
 
 sub format_date_object {
   my ($self, $datetime, %params)    = @_;
 
 }
 
 sub format_date_object {
   my ($self, $datetime, %params)    = @_;
 

-  my $format             =  $::myconfig{dateformat} || 'yyyy-mm-dd';
-  $format                =~ s/yyyy/\%Y/;
-  $format                =~ s/yy/\%y/;
+  my $format             =   $params{dateformat}   || $::myconfig{dateformat}   || 'yyyy-mm-dd';
+  my $num_separator      =  ($params{numberformat} || $::myconfig{numberformat} || '1,000.00') =~ m{,\d+$} ? ',' : '.';
+  $format                =~ s/yy(?:yy)?/\%Y/;

   $format                =~ s/mm/\%m/;
   $format                =~ s/dd/\%d/;
 
   my $precision          =  $params{precision} || 'day';
   $precision             =~ s/s$//;
   my %precision_spec_map = (
   $format                =~ s/mm/\%m/;
   $format                =~ s/dd/\%d/;
 
   my $precision          =  $params{precision} || 'day';
   $precision             =~ s/s$//;
   my %precision_spec_map = (

-    second => '%H:%M:%S',
-    minute => '%H:%M',
-    hour   => '%H',
+    millisecond => '%H:%M:%S' . $num_separator . '%3N',
+    second      => '%H:%M:%S',
+    minute      => '%H:%M',
+    hour        => '%H',

   );
 
   $format .= ' ' . $precision_spec_map{$precision} if $precision_spec_map{$precision};
   );
 
   $format .= ' ' . $precision_spec_map{$precision} if $precision_spec_map{$precision};


@@ -428,13 +460,13 @@ sub reformat_date {
 
   my ($yy, $mm, $dd) = $self->parse_date($myconfig, $date);
 
 
   my ($yy, $mm, $dd) = $self->parse_date($myconfig, $date);
 

-  $output_format =~ /d+/;
+  $output_format =~ /(d+)/;

   substr($output_format, $-[0], $+[0] - $-[0]) =
   substr($output_format, $-[0], $+[0] - $-[0]) =

-    sprintf("%0" . (length($&)) . "d", $dd);
+    sprintf("%0" . (length($1)) . "d", $dd);

 
 

-  $output_format =~ /m+/;
+  $output_format =~ /(m+)/;

   substr($output_format, $-[0], $+[0] - $-[0]) =
   substr($output_format, $-[0], $+[0] - $-[0]) =

-    sprintf("%0" . (length($&)) . "d", $mm);
+    sprintf("%0" . (length($1)) . "d", $mm);

 
   $output_format =~ /y+/;
   substr($output_format, $-[0], $+[0] - $-[0]) = $yy;
 
   $output_format =~ /y+/;
   substr($output_format, $-[0], $+[0] - $-[0]) = $yy;


@@ -461,9 +493,9 @@ sub format_date {
   $yy = $yy % 100 if 2 == $yy_len;
 
   my $format = ref $myconfig eq '' ? "$myconfig" : $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("%0${yy_len}d",            $yy) }gex;
+  $format =~ s{ (d+) }{ sprintf("%0" . (length($1)) . "d", $dd) }gex;
+  $format =~ s{ (m+) }{ sprintf("%0" . (length($1)) . "d", $mm) }gex;
+  $format =~ s{ (y+) }{ sprintf("%0${yy_len}d",            $yy) }gex;

 
   $main::lxdebug->leave_sub();
 
 
   $main::lxdebug->leave_sub();
 


@@ -513,7 +545,7 @@ sub with_raw_io {
   $self->{raw_io_active} = 1;
   binmode $fh, ":raw";
   $code->();
   $self->{raw_io_active} = 1;
   binmode $fh, ":raw";
   $code->();

-  binmode $fh, ":utf8" if $self->is_utf8;
+  binmode $fh, ":utf8";

   $self->{raw_io_active} = 0;
 }
 
   $self->{raw_io_active} = 0;
 }
 


@@ -538,7 +570,20 @@ sub get_local_time_zone {
   return $self->{local_time_zone};
 }
 
   return $self->{local_time_zone};
 }
 

+sub language_join {
+  my ($self, $items, %params) = @_;
+
+  $items               ||= [];
+  $params{conjunction} ||= $::locale->text('and');
+  my $num                = scalar @{ $items };
+
+  return 0 == $num ? ''
+       : 1 == $num ? $items->[0]
+       :             join(', ', @{ $items }[0..$num - 2]) . ' ' . $params{conjunction} . ' ' . $items->[$num - 1];
+}
+

 1;
 1;

+

 __END__
 
 =pod
 __END__
 
 =pod


@@ -603,16 +648,27 @@ Add hour:minute to the date.
 
 Add hour:minute:second to the date.
 
 
 Add hour:minute:second to the date.
 

+=item * C<millisecond>
+
+Add hour:minute:second.millisecond to the date. The decimal separator
+is derived from the number format.
+
+=item * C<numberformat>
+
+The number format to use, e.g. C<1,000.00>. If unset the user's
+current number format is used.
+
+=item * C<dateformat>
+
+The date format to use, e.g. C<mm/dd/yy>. If unset the user's current
+date format is used.
+

 =back
 
 =item C<get_local_time_zone>
 
 TODO: Describe get_local_time_zone
 
 =back
 
 =item C<get_local_time_zone>
 
 TODO: Describe get_local_time_zone
 

-=item C<is_utf8>
-
-TODO: Describe is_utf8
-

 =item C<lang_to_locale>
 
 TODO: Describe lang_to_locale
 =item C<lang_to_locale>
 
 TODO: Describe lang_to_locale


@@ -625,9 +681,14 @@ TODO: Describe new
 
 TODO: Describe parse_date
 
 
 TODO: Describe parse_date
 

-=item C<parse_date_to_object>
+=item C<parse_date_to_object $string, %params>
+
+Parses a date and optional timestamp in C<$string> and returns an
+instance of L<DateTime>. The date and number formats used are the ones
+the user has currently selected. They can be overriden by passing them
+in as parameters to this function, though.

 
 

-TODO: Describe parse_date_to_object
+The time stamps can have up to millisecond precision.

 
 =item C<quote_special_chars>
 
 
 =item C<quote_special_chars>