X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLocale.pm;h=87008734a5c5ebfaef74d6bae97061d9e8c326d5;hb=a7d906be599d13f0e0477987437540243ce886d3;hp=e3ff236927c44d2f915b9ac49af31b1ff736b453;hpb=bc71c253714824c3f1bd5749958302dce5555762;p=kivitendo-erp.git diff --git a/SL/Locale.pm b/SL/Locale.pm index e3ff23692..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(); @@ -213,7 +215,7 @@ sub findsub { 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}"); + $main::form->error("$text not defined in locale/$self->{countrycode}/$self->{NLS_file}"); } $main::lxdebug->leave_sub(); @@ -229,6 +231,8 @@ sub date { my $longdate = ""; my $longmonth = ($longformat) ? 'LONG_MONTH' : 'SHORT_MONTH'; + my ($spc, $yy, $mm, $dd); + if ($date) { # get separator @@ -302,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(); @@ -353,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();