Probleme durch perltidy. Der sehr pingelige Parser von locales.pl akzeptiert Begriffe...

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 566f29a..c1fbb7c 100644 (file)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -344,9 +344,7 @@ $nologin
 | . $locale->text('Click on login name to edit!') . qq|
 <br>
 |
-    . $locale->text(
-    'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.'
-    )
+    . $locale->text('To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.')
     . qq|
 
 <p>
@@ -1195,12 +1193,9 @@ sub dbselect_source {
   &dbdriver_defaults;
 
   $msg{Pg} =
-    $locale->text(
-    'Leave host and port field empty unless you want to make a remote connection.'
-    );
+    $locale->text('Leave host and port field empty unless you want to make a remote connection.');
   $msg{Oracle} =
-    $locale->text(
-           'You must enter a host and port for local and remote connections!');
+    $locale->text('You must enter a host and port for local and remote connections!');
 
   $form->{title} =
     "Lx-Office ERP / " . $locale->text('Database Administration');
@@ -1280,9 +1275,7 @@ sub dbselect_source {
 </table>
 
 <p>|
-    . $locale->text(
-    'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!'
-    )
+    . $locale->text('This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!')
 
     . qq|
 <br>$msg{$form->{dbdriver}}

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 20f1ad8..ced3b08 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -1759,9 +1759,7 @@ sub config {
              </tr>
              <tr>
                <td colspan=2>|
-    . $locale->text(
-    'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies'
-    )
+    . $locale->text('Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies')
     . qq|<br><input name=curr size=40 value="$form->{defaults}{curr}"></td>
              </tr>
             </table>

diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 99f2a04..9378901 100644 (file)
--- a/bin/mozilla/bp.pl
+++ b/bin/mozilla/bp.pl
@@ -281,8 +281,7 @@ sub remove {
 <h2 class=confirm>$form->{title}</h2>
 
 <h4>|
-    . $locale->text(
-          'Are you sure you want to remove the marked entries from the queue?')
+    . $locale->text('Are you sure you want to remove the marked entries from the queue?')
     . qq|</h4>
 
 <input name=action class=submit type=submit value="|

diff --git a/bin/mozilla/licenses.pl b/bin/mozilla/licenses.pl
index 9339736..300673a 100644 (file)
--- a/bin/mozilla/licenses.pl
+++ b/bin/mozilla/licenses.pl
@@ -291,8 +291,7 @@ sub add {
   $lxdebug->enter_sub();
   if (!$lizenzen) {
     $form->error(
-                 $locale->text(
-                   'The licensing module has been deactivated in lx-erp.conf.')
+                 $locale->text('The licensing module has been deactivated in lx-erp.conf.')
     );
   }
 
@@ -543,8 +542,7 @@ sub do_search {
         |);
   if (scalar(@{ $form->{"licenses"} }) == 0) {
     print(qq|</table>|
-            . $locale->text(
-                      "No licenses were found that match the search criteria.")
+            . $locale->text("No licenses were found that match the search criteria.")
             . qq|</body></html>|);
     exit(0);
   }

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index 1bab651..248af2b 100644 (file)
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -236,8 +236,7 @@ sub report {
   $checked = "checked" if ($form->{kz10} eq '1');
   print qq|
            <input name="FA_10" id=FA_10 class=checkbox type=checkbox value="1" $checked title = "|
-    . $locale->text(
-      'Ist dies eine berichtigte Anmeldung? (Nr. 10/Zeile 15 Steuererklärung)')
+    . $locale->text('Ist dies eine berichtigte Anmeldung? (Nr. 10/Zeile 15 Steuererklärung)')
     . qq|">
             | . $locale->text('Berichtigte Anmeldung') . qq|
           <br>
@@ -1228,9 +1227,7 @@ sub edit_form {
 
   # Auf Übergabefehler checken
   USTVA::info(
-    $locale->text(
-      'Bitte das Bundesland UND die Stadt bzw. den Einzugsbereich Ihres zuständigen Finanzamts auswählen.'
-    ))
+    $locale->text('Bitte das Bundesland UND die Stadt bzw. den Einzugsbereich Ihres zuständigen Finanzamts auswählen.'))
     if (   $form->{elsterFFFF_new} eq 'Auswahl'
         || $form->{elsterland_new} eq 'Auswahl');
   USTVA::info(

diff --git a/locale/de/locales.pl b/locale/de/locales.pl
index a358a90..8981e5a 100755 (executable)
--- a/locale/de/locales.pl
+++ b/locale/de/locales.pl
@@ -218,7 +218,10 @@ sub scanfile {
   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 = $&;
@@ -240,14 +243,27 @@ sub scanfile {
       if (/Locale/) {
        unless (/^use /) {
          my ($null, $country) = split /,/;
-         $country =~ s/^ +["']//;
-         $country =~ s/["'].*//;
+         $country =~ s/^ +[\"\']//;
+         $country =~ s/[\"\'].*//;
        }
       }
 
-      if (/\$locale->text.*?\W\)/) {
+      my $postmatch = "";
+      # is it a submit button before $locale->
+      if (/type\s*=\s*submit/i) {
+        $postmatch = $';
+        if ($` !~ /\$locale->text/) {
+          $is_submit = 1;
+          $sub_line_no = $line_no;
+        }
+      }
+
+      my ($found) = /\$locale->text.*?\W\)/;
+      my $postmatch = $';
+
+      if ($found) {
        my $string = $&;
-       $string =~ s/\$locale->text\(\s*['"(q|qq)]['\/\\\|~]*//;
+       $string =~ s/\$locale->text\(\s*[\'\"(q|qq)][\'\/\\\|~]*//;
        $string =~ s/\W\)+.*$//;
 
         # if there is no $ in the string record it
@@ -259,16 +275,23 @@ sub scanfile {
          $alllocales{$string} = 1;
 
           # is it a submit button before $locale->
-          if (/type=submit/) {
+          if ($is_submit) {
            $submit{$string} = 1;
           }
        }
+      } elsif ($postmatch =~ />/) {
+        $is_submit = 0;
       }
 
       # exit loop if there are no more locales on this line
-      ($rc) = ($' =~ /\$locale->text/);
+      ($rc) = ($postmatch =~ /\$locale->text/);
       # strip text
       s/^.*?\$locale->text.*?\)//;
+
+      if (($postmatch =~ />/) ||
+          (!$found && ($sub_line_no != $line_no) && />/)) {
+        $is_submit = 0;
+      }
     }
   }
 

diff --git a/locale/de/rp b/locale/de/rp
index 2680f6c..664fbbf 100644 (file)
--- a/locale/de/rp
+++ b/locale/de/rp
@@ -170,6 +170,7 @@ $self{subs} = {
   'alle_auswählen'              => 'select_all',
   'konfiguration'               => 'config',
   'debug'                       => 'debug',
+  'winston_export'              => 'winston_export',
 };
 
 1;