From: Thomas Heck <theck@linet-services.de>
Date: Thu, 28 Feb 2013 08:58:35 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: release-3.1.0beta1~554^2~1^2~6
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/50868b23fa58529558fd1cf3030e586f988c27ac?hp=6061749dc0ece2873ef61a0c14af1b8a9e46034a

Merge branch 'master' into dev
---

diff --git a/locale/de/all b/locale/de/all
index 15f94b8af..f91b7020a 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -1029,6 +1029,7 @@ $self->{texts} = {
   'Inv. Duedate'                => 'Rg. Fälligkeit',
   'Invalid'                     => 'Ungültig',
   'Invalid follow-up ID.'       => 'Ung&uuml;ltige Wiedervorlage-ID.',
+  'Invalid parameters'          => 'Ungültige Parameter',
   'Invalid quantity.'           => 'Die Mengenangabe ist ung&uuml;ltig.',
   'Invalid request type \'#1\'' => 'Ungültiger Request-Typ \'#1\'',
   'Invdate'                     => 'Rechnungsdatum',
@@ -1138,6 +1139,7 @@ $self->{texts} = {
   'List open SEPA exports'      => 'Noch nicht ausgeführte SEPA-Exporte anzeigen',
   'Load draft'                  => 'Entwurf laden',
   'Load profile'                => 'Profil laden',
+  'Loading...'                  => 'Wird geladen...',
   'Local Tax Office Preferences' => 'Angaben zum Finanzamt',
   'Lock System'                 => 'System sperren',
   'Lockfile created!'           => 'System gesperrt!',
@@ -1565,6 +1567,7 @@ $self->{texts} = {
   'Reconciliation'              => 'Kontenabgleich',
   'Record Vendor Invoice'       => 'Einkaufsrechnung erfassen',
   'Record in'                   => 'Buchen auf',
+  'Record not found'            => 'Objekt nicht gefunden',
   'Recorded Tax'                => 'Gespeicherte Steuern',
   'Recorded taxkey'             => 'Gespeicherter Steuerschlüssel',
   'Reference'                   => 'Referenz',
@@ -2251,6 +2254,7 @@ $self->{texts} = {
   'Warehouses'                  => 'Lager',
   'Warning'                     => 'Warnung',
   'Warnings during template upgrade' => 'Warnungen bei Aktualisierung der Dokumentenvorlagen',
+  'WebDAV'                      => 'WebDAV',
   'WebDAV link'                 => 'WebDAV-Link',
   'Webserver interface'         => 'Webserverschnittstelle',
   'Weight'                      => 'Gewicht',
diff --git a/scripts/locales.pl b/scripts/locales.pl
index 2bf10ec2c..00dc7fe31 100755
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -373,6 +373,13 @@ sub scanfile {
         $cached{$file}{scannosubs}{"../../SL/${module}.pm"} = 1;
       }
 
+      # Some calls to render() are split over multiple lines. Deal
+      # with that.
+      while (/(?:parse_html_template2?|render)\s*\( *$/) {
+        $_ .= <$fh>;
+        chomp;
+      }
+
       # is this a template call?
       if (/(?:parse_html_template2?|render)\s*\(\s*[\"\']([\w\/]+)\s*[\"\']/) {
         my $new_file_base = "$basedir/templates/webpages/$1.";
@@ -519,9 +526,11 @@ sub scanhtmlfile {
 
       while ($line =~ m/\[\%[^\w]*(\w+)\.\w+\(/g) {
         my $plugin = $1;
-        $plugins{needed}->{$plugin} = 1 if (first { $_ eq $plugin } qw(HTML LxERP JavaScript MultiColumnIterator L));
+        $plugins{needed}->{$plugin} = 1 if (first { $_ eq $plugin } qw(HTML LxERP JavaScript MultiColumnIterator JSON L P));
       }
 
+      $plugins{needed}->{T8} = 1 if $line =~ m/\[\%.*\|.*\$T8/;
+
       while ($line =~ m/(?:             # Start von Variante 1: LxERP.t8('...'); ohne darumliegende [% ... %]-Tags
                           (LxERP\.t8)\( #   LxERP.t8(                             ::Parameter $1::
                           ([\'\"])      #   Anfang des zu übersetzenden Strings   ::Parameter $2::