CSV-Export mit UTF-8 als Encoding gefixt

[mfinanz.git] / SL / Locale.pm

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 7f8b6c691bf8021b244cb038f210f33dc75f68f7..b1c8205e8cd1aaae80b6715e76f11eafb7ded05e 100644 (file)
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -213,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);
@@ -462,14 +462,37 @@ 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};
 }
 
 1;