Funktionsnamensauflösung gefixt

[mfinanz.git] / SL / Locale.pm

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 0d2a89517ff6e5f7f50be09431545aa384c9ded1..9e74902ca21d5f13e2b072d955ec5d798d0a0291 100644 (file)
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -36,10 +36,13 @@
 
 package Locale;
 
-use Text::Iconv;
+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;
@@ -87,12 +90,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;
 
-  $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');
+  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->_read_special_chars_file($country);
 
@@ -104,6 +113,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;
@@ -208,27 +223,31 @@ sub findsub {
   $main::lxdebug->enter_sub();
 
   my ($self, $text) = @_;
-  my $text_rev      = $self->{iconv_reverse}->convert($text);
+  my $text_rev      = lc $self->{iconv_reverse}->convert($text);
 
-  $self->{subs}   ||= { };
+  if (!$self->{texts_reverse}) {
+    $self->{texts_reverse} = { };
+    while (my ($original, $translation) = each %{ $self->{texts} }) {
+      $original    =  lc $original;
+      $original    =~ s/[^a-z0-9]/_/g;
+      $original    =~ s/_+/_/g;
 
-  if (!$self->{subs}->{$text_rev}) {
-    $self->{texts_reverse} ||= { reverse %{ $self->{texts} } };
-    my $sub_name             = $self->{texts_reverse}->{$text_rev};
-    $sub_name              ||= $text_rev if $text_rev =~ m/^[a-z][a-z0-9_]+$/;
+      $translation =  lc $translation;
 
-    $main::form->error("$text not defined in locale/$self->{countrycode}/all") if !$sub_name;
+      $self->{texts_reverse}->{$translation} ||= [ ];
+      push @{ $self->{texts_reverse}->{$translation} }, $original;
+    }
+  }
 
-    $sub_name =  lc $sub_name;
-    $sub_name =~ s/[^a-z0-9]/_/g;
-    $sub_name =~ s/_+/_/g;
+  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}" };
 
-    $self->{subs}->{$text_rev} = $sub_name;
-  }
+  $main::form->error("$text not defined in locale/$self->{countrycode}/all") if !$sub_name;
 
   $main::lxdebug->leave_sub();
 
-  return $self->{subs}->{$text_rev};
+  return $sub_name;
 }
 
 sub date {
@@ -402,4 +421,14 @@ sub remap_special_chars {
   return $self->quote_special_chars($dst_format, $self->quote_special_chars("${src_format}-reverse", shift));
 }
 
+sub with_raw_io {
+  my $self = shift;
+  my $fh   = shift;
+  my $code = shift;
+
+  binmode $fh, ":raw";
+  $code->();
+  binmode $fh, ":utf8" if $self->is_utf8;
+}
+
 1;