X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=locale%2Fde%2Flocales.pl;h=6415370443d90466fb5f152c90b3ec8ef8d7bc7c;hb=319c72e8738bbbfd457ae33dafd03ab8d5203a12;hp=5cde35d5a322b332c803a748abf43034135c42d4;hpb=00c278b5eebfd2b245a9d75021126af809318f93;p=kivitendo-erp.git

diff --git a/locale/de/locales.pl b/locale/de/locales.pl
index 5cde35d5a..641537044 100755
--- a/locale/de/locales.pl
+++ b/locale/de/locales.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # -n do not include custom_ scripts
+# -v verbose mode, shows progress stuff
 
 # this version of locles processes not only all required .pl files
 # but also all parse_html_templated files.
@@ -9,10 +10,14 @@ use POSIX;
 use FileHandle;
 use Data::Dumper;
 
+$| = 1;
+
 $basedir  = "../..";
 $bindir   = "$basedir/bin/mozilla";
+$dbupdir  = "$basedir/sql/Pg-upgrade";
+$dbupdir2 = "$basedir/sql/Pg-upgrade2";
 $menufile = "menu.ini";
-$submitsearch = qr/type\s*=\s*["']?submit/i;
+$submitsearch = qr/type\s*=\s*[\"\']?submit/i;
 
 foreach $item (@ARGV) {
   $item =~ s/-//g;
@@ -20,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;
@@ -37,6 +42,14 @@ if ($arg{n}) {
   unshift @menufiles, $menufile;
 }
 
+opendir DIR, $dbupdir or die "$!";
+@dbplfiles = grep { /\.pl$/ } readdir DIR;
+closedir DIR;
+
+opendir DIR, $dbupdir2 or die "$!";
+@dbplfiles2 = grep { /\.pl$/ } readdir DIR;
+closedir DIR;
+
 # slurp the translations in
 if (-f 'all') {
   require "all";
@@ -49,19 +62,24 @@ if (-f 'all') {
 #  scanhtmlfile($file);
 #}
 
-foreach $file (@progfiles) {
+map({ handle_file($_, $bindir); } @progfiles);
+map({ handle_file($_, $dbupdir); } @dbplfiles);
+map({ handle_file($_, $dbupdir2); } @dbplfiles2);
 
+sub handle_file {
+  my ($file, $dir) = @_;
+  print "\n$file" if $arg{v};
   %locale = ();
   %submit = ();
   %subrt  = ();
 
-  &scanfile("$bindir/$file");
+  &scanfile("$dir/$file");
 
   # scan custom_{module}.pl or {login}_{module}.pl files
   foreach $customfile (@customfiles) {
     if ($customfile =~ /_$file/) {
-      if (-f "$bindir/$customfile") {
-        &scanfile("$bindir/$customfile");
+      if (-f "$dir/$customfile") {
+        &scanfile("$dir/$customfile");
       }
     }
   }
@@ -76,6 +94,7 @@ foreach $file (@progfiles) {
   if ($file eq 'menunew.pl') {
     foreach $item (@menufiles) {
       &scanmenu("$basedir/$item");
+      print "." if $arg{v};
     }
   }
 
@@ -86,20 +105,20 @@ foreach $file (@progfiles) {
 
   foreach $text (keys %$missing) {
     if ($locale{$text} || $htmllocale{$text}) {
-      unless ($self{texts}{$text}) {
-        $self{texts}{$text} = $missing->{$text};
+      unless ($self->{texts}{$text}) {
+        $self->{texts}{$text} = $missing->{$text};
       }
     }
   }
 
   open FH, ">$file" or die "$! : $file";
 
-  print FH q|$self{texts} = {
+  print FH q|$self->{texts} = {
 |;
 
   foreach $key (sort keys %locale) {
-    if ($self{texts}{$key}) {
-      $text = $self{texts}{$key};
+    if ($self->{texts}{$key}) {
+      $text = $self->{texts}{$key};
     } else {
       $text = $key;
     }
@@ -117,7 +136,7 @@ foreach $file (@progfiles) {
 
   print FH q|};
 
-$self{subs} = {
+$self->{subs} = {
 |;
 
   foreach $key (sort keys %subrt) {
@@ -128,7 +147,7 @@ $self{subs} = {
   }
 
   foreach $key (sort keys %submit) {
-    $text = ($self{texts}{$key}) ? $self{texts}{$key} : $key;
+    $text = ($self->{texts}{$key}) ? $self->{texts}{$key} : $key;
     $text =~ s/'/\\'/g;
     $text =~ s/\\$/\\\\/;
 
@@ -151,12 +170,13 @@ $self{subs} = {
 |;
 
   close FH;
-}
 
-foreach $file (@htmltemplates) {
-  converthtmlfile($file);
 }
 
+#foreach $file (@htmltemplates) {
+#  converthtmlfile($file);
+#}
+
 # now print out all
 
 open FH, ">all" or die "$! : all";
@@ -166,11 +186,11 @@ print FH q|# These are all the texts to build the translations files.
 # you can add the translation in this file or in the 'missing' file
 # run locales.pl from this directory to rebuild the translation files
 
-$self{texts} = {
+$self->{texts} = {
 |;
 
 foreach $key (sort keys %alllocales) {
-  $text = $self{texts}{$key};
+  $text = $self->{texts}{$key};
 
   $count++;
 
@@ -223,7 +243,9 @@ $trlanguage = $language[0];
 chomp $trlanguage;
 
 $per = sprintf("%.1f", ($count - $notext) / $count * 100);
-print "\n$trlanguage - ${per}%\n";
+print "\n$trlanguage - ${per}%";
+print " - $notext missing" if $notext;
+print "\n";
 
 exit;
 
@@ -282,104 +304,129 @@ sub extract_text_between_parenthesis {
 
 sub scanfile {
   my $file = shift;
+  my $dont_include_subs = shift;
+  my $scanned_files = shift;
 
-  return unless (-f "$file");
+  $scanned_files = {} unless ($scanned_files);
+  return if ($scanned_files->{$file});
+  $scanned_files->{$file} = 1;
 
-  my $fh = new FileHandle;
-  open $fh, "$file" or die "$! : $file";
+  if (!defined $cached{$file}) {
 
-  my ($is_submit, $line_no, $sub_line_no) = (0, 0, 0);
+    return unless (-f "$file");
 
-  while (<$fh>) {
-    $line_no++;
+    my $fh = new FileHandle;
+    open $fh, "$file" or die "$! : $file";
 
-    # is this another file
-    if (/require\s+\W.*\.pl/) {
-      my $newfile = $&;
-      $newfile =~ s/require\s+\W//;
-      $newfile =~ s/\$form->{path}\///;
-      &scanfile("$bindir/$newfile");
-    }
+    my ($is_submit, $line_no, $sub_line_no) = (0, 0, 0);
 
-    # is this a template call?
-    if (/parse_html_template\s*\(\s*["']([\w\/]+)/) {
-      my $newfile = "$basedir/templates/webpages/$1_master.html";
-      if (-f $newfile) {
-        &scanhtmlfile($newfile);
-        &converthtmlfile($newfile);
+    while (<$fh>) {
+      $line_no++;
+
+      # is this another file
+      if (/require\s+\W.*\.pl/) {
+        my $newfile = $&;
+        $newfile =~ s/require\s+\W//;
+        $newfile =~ s/\$form->{path}\///;
+#         &scanfile("$bindir/$newfile", 0, $scanned_files);
+         $cached{$file}{scan}{"$bindir/$newfile"} = 1;
+      } elsif (/use\s+SL::(.*?);/) {
+#         &scanfile("../../SL/${1}.pm", 1, $scanned_files);
+         $cached{$file}{scannosubs}{"../../SL/${1}.pm"} = 1;
       }
-    }
 
-    # is this a sub ?
-    if (/^sub /) {
-      ($null, $subrt) = split / +/;
-      $subrt{$subrt} = 1;
-      next;
-    }
+      # is this a template call?
+      if (/parse_html_template\s*\(\s*[\"\']([\w\/]+)/) {
+        my $newfile = "$basedir/templates/webpages/$1_master.html";
+        if (-f $newfile) {
+#           &scanhtmlfile($newfile);
+#           &converthtmlfile($newfile);
+           $cached{$file}{scanh}{$newfile} = 1;
+          print "." if $arg{v};
+        }
+      }
+
+      # is this a sub ?
+      if (/^sub /) {
+        next if ($dont_include_subs);
+        ($null, $subrt) = split / +/;
+#        $subrt{$subrt} = 1;
+        $cached{$file}{subr}{$subrt} = 1;
+        next;
+      }
 
-    my $rc = 1;
+      my $rc = 1;
 
-    while ($rc) {
-      if (/Locale/) {
-        unless (/^use /) {
-          my ($null, $country) = split /,/;
-          $country =~ s/^ +[\"\']//;
-          $country =~ s/[\"\'].*//;
+      while ($rc) {
+        if (/Locale/) {
+          unless (/^use /) {
+            my ($null, $country) = split /,/;
+            $country =~ s/^ +[\"\']//;
+            $country =~ s/[\"\'].*//;
+          }
         }
-      }
 
-      my $postmatch = "";
+        my $postmatch = "";
 
-      # is it a submit button before $locale->
-      if (/$submitsearch/) {
-        $postmatch = $';
-        if ($` !~ /\$locale->text/) {
-          $is_submit   = 1;
-          $sub_line_no = $line_no;
+        # is it a submit button before $locale->
+        if (/$submitsearch/) {
+          $postmatch = "$'";
+          if ($` !~ /locale->text/) {
+            $is_submit   = 1;
+            $sub_line_no = $line_no;
+          }
         }
-      }
 
-      my ($found) = /\$locale->text.*?\(/;
-      my $postmatch = $';
+        my ($found) = /locale->text.*?\(/;
+        my $postmatch = "$'";
 
-      if ($found) {
-        my $string;
-        ($string, $_) = extract_text_between_parenthesis($fh, $postmatch);
-        $postmatch = $_;
+        if ($found) {
+          my $string;
+          ($string, $_) = extract_text_between_parenthesis($fh, $postmatch);
+          $postmatch = $_;
 
-        # if there is no $ in the string record it
-        unless (($string =~ /\$\D.*/) || ("" eq $string)) {
+          # if there is no $ in the string record it
+          unless (($string =~ /\$\D.*/) || ("" eq $string)) {
 
-          # this guarantees one instance of string
-          $locale{$string} = 1;
+            # this guarantees one instance of string
+#            $locale{$string} = 1;
+            $cached{$file}{locale}{$string} = 1;
 
-          # this one is for all the locales
-          $alllocales{$string} = 1;
+            # this one is for all the locales
+#            $alllocales{$string} = 1;
+            $cached{$file}{all}{$string} = 1;
 
-          # is it a submit button before $locale->
-          if ($is_submit) {
-            $submit{$string} = 1;
+            # is it a submit button before $locale->
+            if ($is_submit) {
+#              $submit{$string} = 1;
+              $cached{$file}{submit}{$string} = 1;
+            }
           }
+        } elsif ($postmatch =~ />/) {
+          $is_submit = 0;
         }
-      } elsif ($postmatch =~ />/) {
-        $is_submit = 0;
-      }
 
-      # exit loop if there are no more locales on this line
-      ($rc) = ($postmatch =~ /\$locale->text/);
+        # exit loop if there are no more locales on this line
+        ($rc) = ($postmatch =~ /locale->text/);
 
-      # strip text
-      s/^.*?\$locale->text.*?\)//;
-
-      if (   ($postmatch =~ />/)
-          || (!$found && ($sub_line_no != $line_no) && />/)) {
-        $is_submit = 0;
+        if (   ($postmatch =~ />/)
+            || (!$found && ($sub_line_no != $line_no) && />/)) {
+          $is_submit = 0;
+        }
       }
     }
-  }
 
-  close($fh);
+    close($fh);
 
+  }
+
+  map { $alllocales{$_} = 1 }   keys %{$cached{$file}{all}};
+  map { $locale{$_} = 1 }       keys %{$cached{$file}{locale}};
+  map { $submit{$_} = 1 }       keys %{$cached{$file}{submit}};
+  map { $subrt{$_} = 1 }        keys %{$cached{$file}{subr}};
+  map { &scanfile($_, 0, $scanned_files) } keys %{$cached{$file}{scan}};
+  map { &scanfile($_, 1, $scanned_files) } keys %{$cached{$file}{scannosubs}};
+  map { &scanhtmlfile($_)  }    keys %{$cached{$file}{scanh}};
 }
 
 sub scanmenu {
@@ -407,51 +454,64 @@ sub scanmenu {
 
 sub scanhtmlfile {
   local *IN;
-
-  open(IN, $_[0]) || die $_[0];
-
-  my $copying = 0;
-  my $issubmit = 0;
-  my $text = "";
-  while (my $line = <IN>) {
-    chomp($line);
-
-    while ("" ne $line) {
-      if (!$copying) {
-        if ($line =~ m|<translate>|i) {
-          my $eom = $+[0];
-          if ($` =~ /$submitsearch/) {
-            $issubmit = 1
+ 
+  if (!defined $cached{$_[0]}) {
+ 
+    open(IN, $_[0]) || die $_[0];
+
+    my $copying = 0;
+    my $issubmit = 0;
+    my $text = "";
+    while (my $line = <IN>) {
+      chomp($line);
+
+      while ("" ne $line) {
+        if (!$copying) {
+          if ($line =~ m|<translate>|i) {
+            my $eom = $+[0];
+            if ($` =~ /$submitsearch/) {
+              $issubmit = 1
+            }
+            substr($line, 0, $eom) = "";
+            $copying = 1;
+          } else {
+            $line = "";
           }
-          substr($line, 0, $eom) = "";
-          $copying = 1;
-        } else {
-          $line = "";
-        }
-
-      } else {
-        if ($line =~ m|</translate>|i) {
-          $text .= $`;
-          substr($line, 0, $+[0]) = "";
-          
-          $copying = 0; 
-          if ($issubmit) {
-            $submit{$text} = 1;
-            $issubmit = 0;
-          }
-          $alllocales{$text} = 1;
-          $htmllocale{$text} = 1;
-          $text = "";
 
         } else {
-          $text .= $line;
-          $line = "";
+          if ($line =~ m|</translate>|i) {
+            $text .= $`;
+            substr($line, 0, $+[0]) = "";
+            $text =~ s/\s+/ /g;
+
+            $copying = 0; 
+            if ($issubmit) {
+  #            $submit{$text} = 1;
+               $cached{$_[0]}{submit}{$text} = 1;
+              $issubmit = 0;
+            }
+  #          $alllocales{$text} = 1;
+             $cached{$_[0]}{all}{$text} = 1;
+  #          $htmllocale{$text} = 1;
+             $cached{$_[0]}{html}{$text} = 1;
+            $text = "";
+
+          } else {
+            $text .= $line;
+            $line = "";
+          }
         }
       }
     }
+
+    close(IN);
+    &converthtmlfile($_[0]);
   }
 
-  close(IN);
+  # copy back into global arrays
+  map { $alllocales{$_} = 1 }  keys %{$cached{$_[0]}{all}};
+  map { $htmllocales{$_} = 1 } keys %{$cached{$_[0]}{html}};
+  map { $submit{$_} = 1 }      keys %{$cached{$_[0]}{submit}};
 }
 
 sub converthtmlfile {
@@ -493,10 +553,11 @@ sub converthtmlfile {
         if ($line =~ m|</translate>|i) {
           $text .= $`;
           substr($line, 0, $+[0]) = "";
+          $text =~ s/\s+/ /g;
           $copying = 0;
           $alllocales{$text} = 1;
           $htmllocale{$text} = 1;
-          print(OUT $self{"texts"}{$text});
+          print(OUT $self->{"texts"}{$text} || $text);
           print(OUT "\n") if ("" eq $line);
           $text = "";