X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=8dc95e73c1bc0305540b51f16160d1f4d2b32cde;hb=bce4bcf8584846bdfc22c9d78e1661bd425ebe9f;hp=4198a339bf03f6bbe46488414f09a5bb31ca3f3f;hpb=79dea6ab7b56149b02d2910ea56f26f13afea291;p=kivitendo-erp.git diff --git a/SL/Locale.pm b/SL/Locale.pm index 4198a339b..8dc95e73c 100644 --- a/SL/Locale.pm +++ b/SL/Locale.pm @@ -95,7 +95,7 @@ sub _init { for my $file (@files) { if (open my $in, "<", "locale/$country/more/$file") { local $/ = undef; - my $code = <$file>; + my $code = <$in>; eval($code); close($in); $self->{texts}{$_} = $self->{more_texts}{$_} for keys %{ $self->{more_texts} }; @@ -394,6 +394,9 @@ sub parse_date_to_object { return undef if !defined $string; + return DateTime->today_local if lc($string) eq 'today'; + return DateTime->today_local->subtract(days => 1) if lc($string) eq 'yesterday'; + $params{dateformat} ||= $::myconfig{dateformat} || 'yy-mm-dd'; $params{numberformat} ||= $::myconfig{numberformat} || '1,000.00'; my $num_separator = $params{numberformat} =~ m{,\d+$} ? ',' : '.';