Wenn $main::myconfig noch nicht verfuegbar ist (z.B. beim Datenbankupgrade direkt...

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

diff --git a/SL/Form.pm b/SL/Form.pm
index a77c302f89cc34e476996860db1a6c8f29f3c866..e7fea51f431682fd2c66b2c9a108e6ddfac2b35f 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -415,26 +415,33 @@ sub parse_html_template {
   $main::lxdebug->enter_sub();
 
   my ($self, $file, $additional_params) = @_;
   $main::lxdebug->enter_sub();
 
   my ($self, $file, $additional_params) = @_;

+  my $language;

 
 

-  if (-f "templates/webpages/${file}_" . $main::myconfig{"countrycode"} .
-      ".html") {
-    if ((-f ".developper") &&
+  if (!defined($main::myconfig) || !defined($main::myconfig{"countrycode"})) {
+    $language = $main::language;
+  } else {
+    $language = $main::myconfig{"countrycode"};
+  }
+
+  if (-f "templates/webpages/${file}_${language}.html") {
+    if ((-f ".developer") &&

         (-f "templates/webpages/${file}_master.html") &&
         ((stat("templates/webpages/${file}_master.html"))[9] >
         (-f "templates/webpages/${file}_master.html") &&
         ((stat("templates/webpages/${file}_master.html"))[9] >

-         (stat("templates/webpages/${file}_" . $main::myconfig{"countrycode"} .
-               ".html"))[9])) {
+         (stat("templates/webpages/${file}_${language}.html"))[9])) {

       my $info = "Developper information: templates/webpages/${file}_master.html is newer than the localized version.\n" .
       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"} . "'.";
+        "Please re-run 'locales.pl' in 'locale/${language}'.";

       print(qq|<pre>$info</pre>|);
       die($info);
     }
 
       print(qq|<pre>$info</pre>|);
       die($info);
     }
 

-    $file = "templates/webpages/${file}_" . $main::myconfig{"countrycode"} .
-      ".html";
+    $file = "templates/webpages/${file}_${language}.html";

   } elsif (-f "templates/webpages/${file}.html") {
     $file = "templates/webpages/${file}.html";
   } else {
   } 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/${language}'.";
+    print(qq|<pre>$info</pre>|);
+    die($info);

   }
 
   my $template = HTML::Template->new("filename" => $file,
   }
 
   my $template = HTML::Template->new("filename" => $file,