X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/2787b39add04ea83761a147d917f7e14400145bf..0dfd8e90aa330f6b4b53f89f0eadf6f1e018a662:/SL/Form.pm diff --git a/SL/Form.pm b/SL/Form.pm index 241cf0bf5..b6f62fb91 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -143,7 +143,6 @@ sub new { $self->{action} =~ s/( |-|,|#)/_/g; $self->{version} = "2.2.0"; - $self->{dbversion} = "2.2.0"; $main::lxdebug->leave_sub(); @@ -245,17 +244,7 @@ sub error { $msg =~ s/\n/
/g; $self->header; - - print qq| - - -

Error!

- -

$msg - - - - |; + $self->show_generic_error($msg); die "Error: $msg\n"; @@ -429,12 +418,26 @@ sub parse_html_template { if (-f "templates/webpages/${file}_" . $main::myconfig{"countrycode"} . ".html") { + if ((-f ".developer") && + (-f "templates/webpages/${file}_master.html") && + ((stat("templates/webpages/${file}_master.html"))[9] > + (stat("templates/webpages/${file}_" . $main::myconfig{"countrycode"} . + ".html"))[9])) { + my $info = "Developper information: templates/webpages/${file}_master.html is newer than the localized version.\n" . + "Please re-run 'locales.pl' in 'locale/" . $main::myconfig{"countrycode"} . "'."; + print(qq|

$info
|); + die($info); + } + $file = "templates/webpages/${file}_" . $main::myconfig{"countrycode"} . ".html"; } elsif (-f "templates/webpages/${file}.html") { $file = "templates/webpages/${file}.html"; } else { - $self->error("Web page template '${file}' not found."); + my $info = "Web page template '${file}' not found.\n" . + "Please re-run 'locales.pl' in 'locale/" . $main::myconfig{"countrycode"} . "'."; + print(qq|
$info
|); + die($info); } my $template = HTML::Template->new("filename" => $file,