X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=locale%2Fde%2Flocales.pl;h=70ca6d20e47c72647f2f913a6a859211de302b84;hb=f559ec45ea2fc09c361ef7e4a40a59b1f2133737;hp=725a9e50b4176c543e94cd36f20047cf6ccce859;hpb=fc9db98bd2391c35c791f6c5c98fd633fcd70e9a;p=kivitendo-erp.git

diff --git a/locale/de/locales.pl b/locale/de/locales.pl
index 725a9e50b..70ca6d20e 100755
--- a/locale/de/locales.pl
+++ b/locale/de/locales.pl
@@ -25,7 +25,7 @@ foreach $item (@ARGV) {
 }
 
 opendir DIR, "$bindir" or die "$!";
-@progfiles = grep { /\.pl$/; !/(_|^\.)/ } readdir DIR;
+@progfiles = grep { /\.pl$/ && !/(_|^\.)/ } readdir DIR;
 seekdir DIR, 0;
 @customfiles = grep /_/, readdir DIR;
 closedir DIR;
@@ -277,7 +277,7 @@ sub extract_text_between_parenthesis {
       } elsif (($cur_char eq '"') || ($cur_char eq '\'')) {
         $inside_string = $cur_char;
 
-      } elsif ($cur_char eq ")") {
+      } elsif (($cur_char eq ")") || ($cur_char eq ',')) {
         return ($text, substr($line, $pos + 1));
       }
 
@@ -327,7 +327,7 @@ sub scanfile {
       if (/require\s+\W.*\.pl/) {
         my $newfile = $&;
         $newfile =~ s/require\s+\W//;
-        $newfile =~ s/\$form->{path}\///;
+        $newfile =~ s|bin/mozilla||;
 #         &scanfile("$bindir/$newfile", 0, $scanned_files);
          $cached{$file}{scan}{"$bindir/$newfile"} = 1;
       } elsif (/use\s+SL::(.*?);/) {
@@ -336,7 +336,7 @@ sub scanfile {
       }
 
       # is this a template call?
-      if (/parse_html_template\s*\(\s*[\"\']([\w\/]+)/) {
+      if (/parse_html_template2?\s*\(\s*[\"\']([\w\/]+)/) {
         my $newfile = "$basedir/templates/webpages/$1_master.html";
         if (-f $newfile) {
 #           &scanhtmlfile($newfile);