@sven s: warum warten? Patch aus Kundenprojekt, der einige Felder in customer auf...

[mfinanz.git] / SL / Locale.pm

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 754d69cf21a738519491f3ac23c95707818c9bcf..4fde61654352b5027afef659713c26ef82c2b8b0 100644 (file)
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -213,7 +213,7 @@ sub text {
   my $self = shift;
   my $text = shift;
 
   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);
     $text = $self->{iconv}->convert($self->{texts}->{$text});
   } else {
     $text = $self->{iconv_english}->convert($text);


@@ -417,6 +417,8 @@ sub format_date {
   my $dd       = shift;
   my $yy_len   = shift || 4;
 
   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;
   $main::lxdebug->leave_sub() and return "" unless $yy && $mm && $dd;
 
   $yy = $yy % 100 if 2 == $yy_len;


@@ -460,14 +462,22 @@ sub remap_special_chars {
   return $self->quote_special_chars($dst_format, $self->quote_special_chars("${src_format}-reverse", shift));
 }
 
   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;
 
 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;
   binmode $fh, ":raw";
   $code->();
   binmode $fh, ":utf8" if $self->is_utf8;

+  $self->{raw_io_active} = 0;

 }
 
 1;
 }
 
 1;