X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Flocales.pl;h=ec9624a60fad3360e780bcf7f9c5bc36a58b0653;hb=a9f30fbdaf8162c9030aa6f042d094ae00e3b7c6;hp=65bd178d488f2925543e25b5ce7ee15f3504929c;hpb=71233175a9443a11e4918a876c5069b105786180;p=kivitendo-erp.git

diff --git a/scripts/locales.pl b/scripts/locales.pl
index 65bd178d4..ec9624a60 100755
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -22,8 +22,11 @@ use File::Slurp qw(slurp);
 use FileHandle;
 use Getopt::Long;
 use IO::Dir;
+use List::MoreUtils qw(apply);
 use List::Util qw(first);
 use Pod::Usage;
+use YAML ();
+use YAML::Loader (); # YAML tries to load Y:L at runtime, but can't find it after we chdir'ed
 
 $OUTPUT_AUTOFLUSH = 1;
 
@@ -40,7 +43,7 @@ my $basedir      = "../..";
 my $locales_dir  = ".";
 my $bindir       = "$basedir/bin/mozilla";
 my @progdirs     = ( "$basedir/SL" );
-my @menufiles    = <${basedir}/menus/*.ini>;
+my @menufiles    = <"${basedir}/menus/*/*">;
 my @javascript_dirs = ($basedir .'/js', $basedir .'/templates/webpages');
 my $javascript_output_dir = $basedir .'/js';
 my $submitsearch = qr/type\s*=\s*[\"\']?submit/i;
@@ -49,7 +52,8 @@ our $missing     = {};
 our @lost        = ();
 
 my %ignore_unused_templates = (
-  map { $_ => 1 } qw(ct/testpage.html generic/autocomplete.html oe/periodic_invoices_email.txt part/testpage.html t/render.html t/render.js task_server/failure_notification_email.txt)
+  map { $_ => 1 } qw(ct/testpage.html generic/autocomplete.html oe/periodic_invoices_email.txt part/testpage.html t/render.html t/render.js task_server/failure_notification_email.txt
+                     failed_background_jobs_report/email.txt)
 );
 
 my (%referenced_html_files, %locale, %htmllocale, %alllocales, %cached, %submit, %jslocale);
@@ -96,13 +100,6 @@ push @progfiles, map { m:^(.+)/([^/]+)$:; [ $2, $1 ] } grep { /\.pm$/ } map { fi
 # put customized files into @customfiles
 my %dir_h;
 
-if ($opt_n) {
-  @customfiles = ();
-} else {
-  tie %dir_h, 'IO::Dir', $basedir;
-  push @menufiles, map { "$basedir/$_" } grep { /.*_menu.ini$/ } keys %dir_h;
-}
-
 my @dbplfiles;
 foreach my $sub_dir ("Pg-upgrade2", "Pg-upgrade2-auth") {
   my $dir = "$basedir/sql/$sub_dir";
@@ -179,9 +176,11 @@ if (@new_missing) {
   if ($opt_f) {
     for my $string (@new_missing) {
       print "new string '$string' in files:\n";
-      for my $file (keys %cached) {
-        print "  $file", $/ if $cached{$file}{all}{$string};
-      }
+      print join "",
+        map   { "  $_\n"                  }
+        apply { s{^(?:\.\./)+}{}          }
+        grep  { $cached{$_}{all}{$string} }
+        keys  %cached;
     }
   }
 
@@ -516,24 +515,13 @@ sub scanfile {
 sub scanmenu {
   my $file = shift;
 
-  my $fh = new FileHandle;
-  open $fh, '<:encoding(utf8)', $file or die "$! : $file";
-
-  my @a = grep m/^\[/, <$fh>;
-  close($fh);
-
-  # strip []
-  grep { s/(\[|\])//g } @a;
+  print STDERR "trying to load file $file\n";
+  my $menu = YAML::LoadFile($file);
 
-  foreach my $item (@a) {
-    my @b = split /--/, $item;
-    foreach my $string (@b) {
-      chomp $string;
-      $locale{$string}     = 1;
-      $alllocales{$string} = 1;
-    }
+  for my $node (@$menu) {
+    $locale{$node->{name}}     = 1;
+    $alllocales{$node->{name}} = 1;
   }
-
 }
 
 sub unescape_template_string {
@@ -617,9 +605,9 @@ sub scanhtmlfile {
                       \s+           # Mindestens ein Whitespace
                       [\'\"]?       # Anfang des Dateinamens
                       ([^\s]+)      # Beliebig viele Nicht-Whitespaces -- Dateiname
-                      \.html        # Endung ".html", ansonsten kann es der Name eines Blocks sein
+                      \.(html|js)   # Endung ".html" oder ".js", ansonsten kann es der Name eines Blocks sein
                      /ix) {
-      my $new_file_name = "$basedir/templates/webpages/$1.html";
+      my $new_file_name = "$basedir/templates/webpages/$1.$2";
       $cached{$file}{scanh}{$new_file_name} = 1;
       substr $line, $LAST_MATCH_START[1], $LAST_MATCH_END[0] - $LAST_MATCH_START[0], '';
     }
@@ -776,7 +764,7 @@ Be more verbose.
 
 =head1 DESCRIPTION
 
-This script collects strings from Perl files, the menu.ini file and
+This script collects strings from Perl files, the menu files and
 HTML templates and puts them into the file "all" for translation.
 
 =cut