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

diff --git a/locale/de/locales.pl b/locale/de/locales.pl
index a358a905e..641537044 100755
--- a/locale/de/locales.pl
+++ b/locale/de/locales.pl
@@ -1,13 +1,23 @@
 #!/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.
+
+use POSIX;
 use FileHandle;
+use Data::Dumper;
 
+$| = 1;
 
-$basedir = "../..";
-$bindir = "$basedir/bin/mozilla";
+$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;
 
 foreach $item (@ARGV) {
   $item =~ s/-//g;
@@ -32,60 +42,83 @@ 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";
 }
 
+# Read HTML templates.
+#%htmllocale = ();
+#@htmltemplates = <../../templates/webpages/*/*_master.html>;
+#foreach $file (@htmltemplates) {
+#  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");
+  %subrt  = ();
+
+  &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");
       }
     }
   }
-  
+
   # if this is the menu.pl file
   if ($file eq 'menu.pl') {
     foreach $item (@menufiles) {
       &scanmenu("$basedir/$item");
     }
   }
-  
-  $file =~ s/\.pl//;
 
+  if ($file eq 'menunew.pl') {
+    foreach $item (@menufiles) {
+      &scanmenu("$basedir/$item");
+      print "." if $arg{v};
+    }
+  }
+
+  $file =~ s/\.pl//;
 
   eval { require 'missing'; };
   unlink 'missing';
 
   foreach $text (keys %$missing) {
-    if ($locale{$text}) {
-      unless ($self{texts}{$text}) {
-	$self{texts}{$text} = $missing->{$text};
+    if ($locale{$text} || $htmllocale{$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;
     }
@@ -95,24 +128,26 @@ foreach $file (@progfiles) {
     $keytext = $key;
     $keytext =~ s/'/\\'/g;
     $keytext =~ s/\\$/\\\\/;
-    
-    print FH qq|  '$keytext'|.(' ' x (27-length($keytext))).qq| => '$text',\n|;
+
+    print FH qq|  '$keytext'|
+      . (' ' x (27 - length($keytext)))
+      . qq| => '$text',\n|;
   }
 
   print FH q|};
 
-$self{subs} = {
+$self->{subs} = {
 |;
-  
+
   foreach $key (sort keys %subrt) {
     $text = $key;
     $text =~ s/'/\\'/g;
     $text =~ s/\\$/\\\\/;
-    print FH qq|  '$text'|.(' ' x (27-length($text))).qq| => '$text',\n|;
+    print FH qq|  '$text'| . (' ' x (27 - length($text))) . qq| => '$text',\n|;
   }
 
   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/\\$/\\\\/;
 
@@ -120,21 +155,27 @@ $self{subs} = {
     $english_sub =~ s/'/\\'/g;
     $english_sub =~ s/\\$/\\\\/;
     $english_sub = lc $key;
-    
+
     $translated_sub = lc $text;
-    $english_sub =~ s/( |-|,)/_/g;
+    $english_sub    =~ s/( |-|,)/_/g;
     $translated_sub =~ s/( |-|,)/_/g;
-    print FH qq|  '$translated_sub'|.(' ' x (27-length($translated_sub))).qq| => '$english_sub',\n|;
+    print FH qq|  '$translated_sub'|
+      . (' ' x (27 - length($translated_sub)))
+      . qq| => '$english_sub',\n|;
   }
-  
+
   print FH q|};
 
 1;
 |;
 
   close FH;
+
 }
 
+#foreach $file (@htmltemplates) {
+#  converthtmlfile($file);
+#}
 
 # now print out all
 
@@ -145,26 +186,25 @@ 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++;
-  
+
   $text =~ s/'/\\'/g;
   $text =~ s/\\$/\\\\/;
-  $key =~ s/'/\\'/g;
-  $key =~ s/\\$/\\\\/;
+  $key  =~ s/'/\\'/g;
+  $key  =~ s/\\$/\\\\/;
 
   unless ($text) {
     $notext++;
     push @missing, $key;
   }
 
-  print FH qq|  '$key'|.(' ' x (27-length($key))).qq| => '$text',\n|;
+  print FH qq|  '$key'| . (' ' x (27 - length($key))) . qq| => '$text',\n|;
 
 }
 
@@ -175,7 +215,6 @@ print FH q|};
 
 close FH;
 
-
 if (@missing) {
   open FH, ">missing" or die "$! : missing";
 
@@ -185,7 +224,7 @@ $missing = {
 |;
 
   foreach $text (@missing) {
-    print FH qq|  '$text'|.(' ' x (27-length($text))).qq| => '',\n|;
+    print FH qq|  '$text'| . (' ' x (27 - length($text))) . qq| => '',\n|;
   }
 
   print FH q|};
@@ -194,7 +233,7 @@ $missing = {
 |;
 
   close FH;
-  
+
 }
 
 open(FH, "LANGUAGE");
@@ -204,78 +243,191 @@ $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;
+
 # eom
 
+sub extract_text_between_parenthesis {
+  my ($fh, $line) = @_;
+  my ($inside_string, $pos, $text, $quote_next) = (undef, 0, "", 0);
+
+  while (1) {
+    if (length($line) <= $pos) {
+      $line = <$fh>;
+      return ($text, "") unless ($line);
+      $pos = 0;
+    }
+
+    my $cur_char = substr($line, $pos, 1);
+
+    if (!$inside_string) {
+      if ((length($line) >= ($pos + 3)) && (substr($line, $pos, 2)) eq "qq") {
+        $inside_string = substr($line, $pos + 2, 1);
+        $pos += 2;
+
+      } elsif ((length($line) >= ($pos + 2)) &&
+               (substr($line, $pos, 1) eq "q")) {
+        $inside_string = substr($line, $pos + 1, 1);
+        $pos++;
+
+      } elsif (($cur_char eq '"') || ($cur_char eq '\'')) {
+        $inside_string = $cur_char;
+
+      } elsif ($cur_char eq ")") {
+        return ($text, substr($line, $pos + 1));
+      }
+
+    } else {
+      if ($quote_next) {
+        $text .= $cur_char;
+        $quote_next = 0;
+
+      } elsif ($cur_char eq '\\') {
+        $text .= $cur_char;
+        $quote_next = 1;
+
+      } elsif ($cur_char eq $inside_string) {
+        undef($inside_string);
+
+      } else {
+        $text .= $cur_char;
+
+      }
+    }
+    $pos++;
+  }
+}
 
 sub scanfile {
   my $file = shift;
+  my $dont_include_subs = shift;
+  my $scanned_files = shift;
 
-  return unless (-f "$file");
-  
-  my $fh = new FileHandle;
-  open $fh, "$file" or die "$! : $file";
+  $scanned_files = {} unless ($scanned_files);
+  return if ($scanned_files->{$file});
+  $scanned_files->{$file} = 1;
 
-  while (<$fh>) {
-    # is this another file
-    if (/require\s+\W.*\.pl/) {
-      my $newfile = $&;
-      $newfile =~ s/require\s+\W//;
-      $newfile =~ s/\$form->{path}\///;
-      &scanfile("$bindir/$newfile");
-    }
-   
-    # is this a sub ?
-    if (/^sub /) {
-      ($null, $subrt) = split / +/;
-      $subrt{$subrt} = 1;
-      next;
-    }
-    
-    my $rc = 1;
-    
-    while ($rc) {
-      if (/Locale/) {
-	unless (/^use /) {
-	  my ($null, $country) = split /,/;
-	  $country =~ s/^ +["']//;
-	  $country =~ s/["'].*//;
-	}
+  if (!defined $cached{$file}) {
+
+    return unless (-f "$file");
+
+    my $fh = new FileHandle;
+    open $fh, "$file" or die "$! : $file";
+
+    my ($is_submit, $line_no, $sub_line_no) = (0, 0, 0);
+
+    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;
       }
 
-      if (/\$locale->text.*?\W\)/) {
-	my $string = $&;
-	$string =~ s/\$locale->text\(\s*['"(q|qq)]['\/\\\|~]*//;
-	$string =~ s/\W\)+.*$//;
+      # 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};
+        }
+      }
 
-        # if there is no $ in the string record it
-	unless ($string =~ /\$\D.*/) {
-	  # this guarantees one instance of string
-	  $locale{$string} = 1;
+      # is this a sub ?
+      if (/^sub /) {
+        next if ($dont_include_subs);
+        ($null, $subrt) = split / +/;
+#        $subrt{$subrt} = 1;
+        $cached{$file}{subr}{$subrt} = 1;
+        next;
+      }
 
-          # this one is for all the locales
-	  $alllocales{$string} = 1;
+      my $rc = 1;
 
-          # is it a submit button before $locale->
-          if (/type=submit/) {
-	    $submit{$string} = 1;
+      while ($rc) {
+        if (/Locale/) {
+          unless (/^use /) {
+            my ($null, $country) = split /,/;
+            $country =~ s/^ +[\"\']//;
+            $country =~ s/[\"\'].*//;
           }
-	}
-      }
+        }
+
+        my $postmatch = "";
+
+        # 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 = "$'";
+
+        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)) {
 
-      # exit loop if there are no more locales on this line
-      ($rc) = ($' =~ /\$locale->text/);
-      # strip text
-      s/^.*?\$locale->text.*?\)//;
+            # this guarantees one instance of string
+#            $locale{$string} = 1;
+            $cached{$file}{locale}{$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;
+              $cached{$file}{submit}{$string} = 1;
+            }
+          }
+        } elsif ($postmatch =~ />/) {
+          $is_submit = 0;
+        }
+
+        # exit loop if there are no more locales on this line
+        ($rc) = ($postmatch =~ /locale->text/);
+
+        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 {
   my $file = shift;
@@ -288,16 +440,135 @@ sub scanmenu {
 
   # strip []
   grep { s/(\[|\])//g } @a;
-  
+
   foreach my $item (@a) {
     @b = split /--/, $item;
     foreach $string (@b) {
       chomp $string;
-      $locale{$string} = 1;
+      $locale{$string}     = 1;
       $alllocales{$string} = 1;
     }
   }
-  
+
+}
+
+sub scanhtmlfile {
+  local *IN;
+ 
+  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 = "";
+          }
+
+        } else {
+          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]);
+  }
+
+  # 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 {
+  local *IN;
+  local *OUT;
+
+  my $file = shift;
+
+  open(IN, $file) || die;
+
+  my $langcode = (split("/", getcwd()))[-1];
+  $file =~ s/_master.html$/_${langcode}.html/;
+
+  open(OUT, ">$file") || die;
+
+  my $copying = 0;
+  my $text = "";
+  while (my $line = <IN>) {
+    chomp($line);
+    if ("" eq $line) {
+      print(OUT "\n");
+      next;
+    }
+
+    while ("" ne $line) {
+      if (!$copying) {
+        if ($line =~ m|<translate>|i) {
+          print(OUT $`);
+          substr($line, 0, $+[0]) = "";
+          $copying = 1;
+          print(OUT "\n") if ("" eq $line);
+
+        } else {
+          print(OUT "${line}\n");
+          $line = "";
+        }
+
+      } else {
+        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} || $text);
+          print(OUT "\n") if ("" eq $line);
+          $text = "";
+
+        } else {
+          $text .= $line;
+          $line = "";
+        }
+      }
+    }
+  }
 
+  close(IN);
+  close(OUT);
+}