Merge branch 'master' into rb-wiederkehrende-rechnungen

[kivitendo-erp.git] / SL / Locale.pm

diff --git a/SL/Locale.pm b/SL/Locale.pm
index 1f0c9f3..c45a1a1 100644 (file)
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -232,6 +232,7 @@ sub findsub {
 
   my ($self, $text) = @_;
   my $text_rev      = lc $self->{iconv_reverse}->convert($text);
+  $text_rev         =~ s/[\s\-]+/_/g;
 
   if (!$self->{texts_reverse}) {
     $self->{texts_reverse} = { };
@@ -241,7 +242,7 @@ sub findsub {
       $original    =~ s/_+/_/g;
 
       $translation =  lc $translation;
-      $translation =~ s/\s+/_/g;
+      $translation =~ s/[\s\-]+/_/g;
 
       $self->{texts_reverse}->{$translation} ||= [ ];
       push @{ $self->{texts_reverse}->{$translation} }, $original;
@@ -496,4 +497,10 @@ sub restore_numberformat {
   $myconfig->{numberformat} = $self->{saved_numberformat} if $self->{saved_numberformat};
 }
 
+sub get_local_time_zone {
+  my $self = shift;
+  $self->{local_time_zone} ||= DateTime::TimeZone->new(name => 'local');
+  return $self->{local_time_zone};
+}
+
 1;