X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=9e74902ca21d5f13e2b072d955ec5d798d0a0291;hb=f5f077a7993b74d793005e3aea6664debef07853;hp=0b535d74036ca6e52646bffa0996ea517bff3560;hpb=eb0c10b0a09da8ff4590c3043a9fa6dd10775ee4;p=kivitendo-erp.git

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 0b535d740..9e74902ca 100644
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -36,25 +36,30 @@
 
 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;
+
 sub new {
   $main::lxdebug->enter_sub();
 
-  my ($type, $country, $NLS_file) = @_;
+  my ($type, $country) = @_;
+
+  $country ||= $::language;
+  $country   =~ s|.*/||;
+  $country   =~ s|\.||g;
 
   my $self = {};
   bless $self, $type;
 
-  $country  =~ s|.*/||;
-  $country  =~ s|\.||g;
-  $NLS_file =~ s|.*/||;
-
-  $self->_init($country, $NLS_file);
+  $self->_init($country);
 
   $main::lxdebug->leave_sub();
 
@@ -64,12 +69,13 @@ sub new {
 sub _init {
   my $self     = shift;
   my $country  = shift;
-  my $NLS_file = shift;
+
+  $self->{charset}     = Common::DEFAULT_CHARSET;
+  $self->{countrycode} = $country;
 
   if ($country && -d "locale/$country") {
     local *IN;
-    $self->{countrycode} = $country;
-    if (open(IN, "<", "locale/$country/$NLS_file")) {
+    if (open(IN, "<", "locale/$country/all")) {
       my $code = join("", <IN>);
       eval($code);
       close(IN);
@@ -80,23 +86,24 @@ sub _init {
       close IN;
 
       chomp $self->{charset};
-
-    } else {
-      $self->{charset} = Common::DEFAULT_CHARSET;
     }
+  }
 
-    my $db_charset            = $main::dbcharset || Common::DEFAULT_CHARSET;
-
-    $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');
+  my $db_charset            = $main::dbcharset || Common::DEFAULT_CHARSET;
+  $self->{is_utf8}          = (any { lc($::dbcharset || '') eq $_ } qw(utf8 utf-8 unicode)) ? 1 : 0;
 
-    $self->_read_special_chars_file($country);
+  if ($self->{is_utf8}) {
+    binmode STDOUT, ":utf8";
+    binmode STDERR, ":utf8";
   }
 
-  $self->{NLS_file} = $NLS_file;
+  $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);
 
   push @{ $self->{LONG_MONTH} },
     ("January",   "February", "March",    "April",
@@ -106,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;
@@ -210,17 +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);
+
+  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 (exists $self->{subs}{$text_rev}) {
-    $text = $self->{subs}{$text_rev};
-  } elsif ($self->{countrycode} && $self->{NLS_file}) {
-    Form->error("$text not defined in locale/$self->{countrycode}/$self->{NLS_file}");
+      $translation =  lc $translation;
+
+      $self->{texts_reverse}->{$translation} ||= [ ];
+      push @{ $self->{texts_reverse}->{$translation} }, $original;
+    }
   }
 
+  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;
+
   $main::lxdebug->leave_sub();
 
-  return $text;
+  return $sub_name;
 }
 
 sub date {
@@ -231,6 +258,8 @@ sub date {
   my $longdate  = "";
   my $longmonth = ($longformat) ? 'LONG_MONTH' : 'SHORT_MONTH';
 
+  my ($spc, $yy, $mm, $dd);
+
   if ($date) {
 
     # get separator
@@ -304,6 +333,7 @@ sub parse_date {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $date, $longformat) = @_;
+  my ($spc, $yy, $mm, $dd);
 
   unless ($date) {
     $main::lxdebug->leave_sub();
@@ -355,11 +385,7 @@ sub reformat_date {
     sprintf("%0" . (length($&)) . "d", $mm);
 
   $output_format =~ /y+/;
-  if (length($&) == 2) {
-    $yy -= $yy >= 2000 ? 2000 : 1900;
-  }
-  substr($output_format, $-[0], $+[0] - $-[0]) =
-    sprintf("%0" . (length($&)) . "d", $yy);
+  substr($output_format, $-[0], $+[0] - $-[0]) = $yy;
 
   $main::lxdebug->leave_sub();
 
@@ -395,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;