X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=87008734a5c5ebfaef74d6bae97061d9e8c326d5;hb=a7d906be599d13f0e0477987437540243ce886d3;hp=2b662bf174281656f0a4cc83bbd5447610cc80a2;hpb=13aa45933d8b41450c92d2815daa6796a134b64b;p=kivitendo-erp.git

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 2b662bf17..87008734a 100644
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -42,6 +42,8 @@ use SL::LXDebug;
 use SL::Common;
 use SL::Inifile;
 
+use strict;
+
 sub new {
   $main::lxdebug->enter_sub();
 
@@ -66,9 +68,12 @@ sub _init {
   my $country  = shift;
   my $NLS_file = shift;
 
+  $self->{charset}     = Common::DEFAULT_CHARSET;
+  $self->{countrycode} = $country;
+  $self->{NLS_file}    = $NLS_file;
+
   if ($country && -d "locale/$country") {
     local *IN;
-    $self->{countrycode} = $country;
     if (open(IN, "<", "locale/$country/$NLS_file")) {
       my $code = join("", <IN>);
       eval($code);
@@ -80,21 +85,18 @@ sub _init {
       close IN;
 
       chomp $self->{charset};
-
-    } else {
-      $self->{charset} = Common::DEFAULT_CHARSET;
     }
+  }
 
-    $self->_read_special_chars_file($country);
-
-    my $db_charset         = $main::dbcharset || Common::DEFAULT_CHARSET;
+  my $db_charset            = $main::dbcharset || Common::DEFAULT_CHARSET;
 
-    $self->{iconv}         = Text::Iconv->new($self->{charset}, $db_charset);
-    $self->{iconv_english} = Text::Iconv->new('ASCII',          $db_charset);
-    $self->{iconv_iso8859} = Text::Iconv->new('ISO-8859-15',    $db_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');
 
-  $self->{NLS_file} = $NLS_file;
+  $self->_read_special_chars_file($country);
 
   push @{ $self->{LONG_MONTH} },
     ("January",   "February", "March",    "April",
@@ -166,13 +168,13 @@ sub _read_special_chars_file {
     }
 
     my $scmap = $self->{special_chars_map}->{$format};
-    my $order = $scmap->{order};
+    my $order = $self->{iconv}->convert($scmap->{order});
     delete $scmap->{order};
 
     foreach my $key (keys %{ $scmap }) {
-      $scmap->{$key} = $self->_handle_markup($scmap->{$key});
+      $scmap->{$key} = $self->_handle_markup($self->{iconv}->convert($scmap->{$key}));
 
-      my $new_key    = $self->_handle_markup($key);
+      my $new_key    = $self->_handle_markup($self->{iconv}->convert($key));
 
       if ($key ne $new_key) {
         $scmap->{$new_key} = $scmap->{$key};
@@ -208,14 +210,12 @@ sub findsub {
   $main::lxdebug->enter_sub();
 
   my ($self, $text) = @_;
+  my $text_rev      = $self->{iconv_reverse}->convert($text);
 
-  if (exists $self->{subs}{$text}) {
-    $text = $self->{subs}{$text};
-  } else {
-    if ($self->{countrycode} && $self->{NLS_file}) {
-      Form->error(
-         "$text not defined in locale/$self->{countrycode}/$self->{NLS_file}");
-    }
+  if (exists $self->{subs}{$text_rev}) {
+    $text = $self->{subs}{$text_rev};
+  } elsif ($self->{countrycode} && $self->{NLS_file}) {
+    $main::form->error("$text not defined in locale/$self->{countrycode}/$self->{NLS_file}");
   }
 
   $main::lxdebug->leave_sub();
@@ -231,6 +231,8 @@ sub date {
   my $longdate  = "";
   my $longmonth = ($longformat) ? 'LONG_MONTH' : 'SHORT_MONTH';
 
+  my ($spc, $yy, $mm, $dd);
+
   if ($date) {
 
     # get separator
@@ -304,6 +306,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 +358,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();