X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=87008734a5c5ebfaef74d6bae97061d9e8c326d5;hb=3ac44613aaf706c083d74bee399ee445420a5f54;hp=a6756fefeae0d3024ffb68ca6d1521aef13f8e1b;hpb=ebacee0a54bad3082004f93d64bf450a835db72c;p=kivitendo-erp.git

diff --git a/SL/Locale.pm b/SL/Locale.pm
index a6756fefe..87008734a 100644
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -40,20 +40,40 @@ use Text::Iconv;
 
 use SL::LXDebug;
 use SL::Common;
+use SL::Inifile;
+
+use strict;
 
 sub new {
   $main::lxdebug->enter_sub();
 
   my ($type, $country, $NLS_file) = @_;
+
   my $self = {};
+  bless $self, $type;
 
   $country  =~ s|.*/||;
   $country  =~ s|\.||g;
   $NLS_file =~ s|.*/||;
 
+  $self->_init($country, $NLS_file);
+
+  $main::lxdebug->leave_sub();
+
+  return $self;
+}
+
+sub _init {
+  my $self     = shift;
+  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);
@@ -65,18 +85,18 @@ sub new {
       close IN;
 
       chomp $self->{charset};
-
-    } else {
-      $self->{charset} = Common::DEFAULT_CHARSET;
     }
-
-    my $db_charset = $main::dbcharset;
-    $db_charset ||= Common::DEFAULT_CHARSET;
-    $self->{iconv} = Text::Iconv->new($self->{charset}, $db_charset);
-    $self->{iconv_english} = Text::Iconv->new("ASCII", $db_charset);
   }
 
-  $self->{NLS_file} = $NLS_file;
+  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');
+
+  $self->_read_special_chars_file($country);
 
   push @{ $self->{LONG_MONTH} },
     ("January",   "February", "March",    "April",
@@ -84,34 +104,118 @@ sub new {
      "September", "October",  "November", "December");
   push @{ $self->{SHORT_MONTH} },
     (qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec));
+}
 
-  $main::lxdebug->leave_sub();
+sub _handle_markup {
+  my $self    = shift;
+  my $str     = shift;
 
-  bless $self, $type;
+  my $escaped = 0;
+  my $new_str = '';
+
+  for (my $i = 0; $i < length $str; $i++) {
+    my $char = substr $str, $i, 1;
+
+    if ($escaped) {
+      if ($char eq 'n') {
+        $new_str .= "\n";
+
+      } elsif ($char eq 'r') {
+        $new_str .= "\r";
+
+      } elsif ($char eq 's') {
+        $new_str .= ' ';
+
+      } elsif ($char eq 'x') {
+        $new_str .= chr(hex(substr($str, $i + 1, 2)));
+        $i       += 2;
+
+      } else {
+        $new_str .= $char;
+      }
+
+      $escaped  = 0;
+
+    } elsif ($char eq '\\') {
+      $escaped  = 1;
+
+    } else {
+      $new_str .= $char;
+    }
+  }
+
+  return $new_str;
+}
+
+sub _read_special_chars_file {
+  my $self    = shift;
+  my $country = shift;
+
+  if (! -f "locale/$country/special_chars") {
+    $self->{special_chars_map} = {};
+    return;
+  }
+
+  $self->{special_chars_map} = Inifile->new("locale/$country/special_chars", 'verbatim' => 1);
+
+  foreach my $format (keys %{ $self->{special_chars_map} }) {
+    next if (($format eq 'FILE') || ($format eq 'ORDER') || (ref $self->{special_chars_map}->{$format} ne 'HASH'));
+
+    if ($format ne lc $format) {
+      $self->{special_chars_map}->{lc $format} = $self->{special_chars_map}->{$format};
+      delete $self->{special_chars_map}->{$format};
+      $format = lc $format;
+    }
+
+    my $scmap = $self->{special_chars_map}->{$format};
+    my $order = $self->{iconv}->convert($scmap->{order});
+    delete $scmap->{order};
+
+    foreach my $key (keys %{ $scmap }) {
+      $scmap->{$key} = $self->_handle_markup($self->{iconv}->convert($scmap->{$key}));
+
+      my $new_key    = $self->_handle_markup($self->{iconv}->convert($key));
+
+      if ($key ne $new_key) {
+        $scmap->{$new_key} = $scmap->{$key};
+        delete $scmap->{$key};
+      }
+    }
+
+    $self->{special_chars_map}->{"${format}-reverse"}          = { reverse %{ $scmap } };
+
+    $scmap->{order}                                            = [ map { $self->_handle_markup($_) } split m/\s+/, $order ];
+    $self->{special_chars_map}->{"${format}-reverse"}->{order} = [ grep { $_ } map { $scmap->{$_} } reverse @{ $scmap->{order} } ];
+  }
 }
 
 sub text {
-  my ($self, $text) = @_;
+  my $self = shift;
+  my $text = shift;
 
   if (exists $self->{texts}->{$text}) {
-    return $self->{iconv}->convert($self->{texts}->{$text});
+    $text = $self->{iconv}->convert($self->{texts}->{$text});
+  } else {
+    $text = $self->{iconv_english}->convert($text);
+  }
+
+  if (@_) {
+    $text = Form->format_string($text, @_);
   }
 
-  return $self->{iconv_english}->convert($text);
+  return $text;
 }
 
 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();
@@ -127,6 +231,8 @@ sub date {
   my $longdate  = "";
   my $longmonth = ($longformat) ? 'LONG_MONTH' : 'SHORT_MONTH';
 
+  my ($spc, $yy, $mm, $dd);
+
   if ($date) {
 
     # get separator
@@ -200,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();
@@ -251,15 +358,40 @@ 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();
 
   return $output_format;
 }
 
+sub quote_special_chars {
+  my $self   = shift;
+  my $format = lc shift;
+  my $string = shift;
+
+  if ($self->{special_chars_map} && $self->{special_chars_map}->{$format} && $self->{special_chars_map}->{$format}->{order}) {
+    my $scmap = $self->{special_chars_map}->{$format};
+
+    map { $string =~ s/\Q${_}\E/$scmap->{$_}/g } @{ $scmap->{order} };
+  }
+
+  return $string;
+}
+
+sub unquote_special_chars {
+  my $self    = shift;
+  my $format  = shift;
+
+  return $self->quote_special_chars("${format}-reverse", shift);
+}
+
+sub remap_special_chars {
+  my $self       = shift;
+  my $src_format = shift;
+  my $dst_format = shift;
+
+  return $self->quote_special_chars($dst_format, $self->quote_special_chars("${src_format}-reverse", shift));
+}
+
 1;