Merge branch 'master' of ssh://lx-office/~/lx-office-erp

[kivitendo-erp.git] / locale / de / locales.pl

diff --git a/locale/de/locales.pl b/locale/de/locales.pl
index a497ee6..bb30c7a 100755 (executable)
--- a/locale/de/locales.pl
+++ b/locale/de/locales.pl
@@ -315,7 +315,7 @@ if ($opt_c) {
 
 $per = sprintf("%.1f", ($count - $notext) / $count * 100);
 print "\n$trlanguage - ${per}%";
-print " - $notext missing" if $notext;
+print " - $notext/$count missing" if $notext;
 print "\n";
 
 exit;
@@ -558,6 +558,25 @@ sub scanhtmlfile {
         $plugins{needed}->{$plugin} = 1 if (first { $_ eq $plugin } qw(HTML LxERP JavaScript MultiColumnIterator));
       }
 
+      while ($line =~ m/\[\%            # Template-Start-Tag
+                        [\-~#]          # Whitespace-Unterdrückung
+                        \s*             # Optional beliebig viele Whitespace
+                        [\'\"]          # Anfang des zu übersetzenden Strings
+                        (.*?)           # Der zu übersetzende String
+                        [\'\"]          # Ende des zu übersetzenden Strings
+                        \s*\|\s*        # Pipe-Zeichen mit optionalen Whitespace davor und danach
+                        \$T8            # Filteraufruf
+                        .*?             # Optionale Argumente für den Filter und Whitespaces
+                        [\-~#]          # Whitespace-Unterdrückung
+                        \%\]            # Template-Ende-Tag
+                       /ix) {
+        print "Found filter >>>$1<<<\n";
+        $cached{$_[0]}{all}{$1}  = 1;
+        $cached{$_[0]}{html}{$1} = 1;
+        $plugins{needed}->{T8}   = 1;
+        substr $line, $-[1], $+[0] - $-[0], '';
+      }
+
       while ("" ne $line) {
         if (!$copying) {
           if ($line =~ m|<translate>|i) {
@@ -577,7 +596,7 @@ sub scanhtmlfile {
             substr($line, 0, $+[0]) = "";
             $text =~ s/\s+/ /g;
 
-            $copying = 0; 
+            $copying = 0;
             if ($issubmit) {
   #            $submit{$text} = 1;
                $cached{$_[0]}{submit}{$text} = 1;
@@ -608,9 +627,9 @@ sub scanhtmlfile {
   }
 
   # 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}};
+  map { $alllocales{$_} = 1 } keys %{$cached{$_[0]}{all}};
+  map { $htmllocale{$_} = 1 } keys %{$cached{$_[0]}{html}};
+  map { $submit{$_} = 1 }     keys %{$cached{$_[0]}{submit}};
 }
 
 sub converthtmlfile {