Form::parse_html_template() darf Form::error() nicht aufrufen, weil die wiederum...

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

diff --git a/SL/Form.pm b/SL/Form.pm
index 90f412018895a6931a8815d2de8db440debf45e5..b6f62fb9155637049a0601f937323b92ed8750f9 100644 (file)
--- 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();
 
@@ -419,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|<pre>$info</pre>|);
+      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|<pre>$info</pre>|);
+    die($info);
   }
 
   my $template = HTML::Template->new("filename" => $file,