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/kivitendo-erp.git/commitdiff_plain/50868b23fa58529558fd1cf3030e586f988c27ac?hp=-c

Merge branch 'master' into dev
---

50868b23fa58529558fd1cf3030e586f988c27ac
diff --combined scripts/locales.pl
index 2bf10ec2c,cfb85d9a4..00dc7fe31
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@@ -36,13 -36,12 +36,13 @@@ my @progdirs     = ( "$basedir/SL" )
  my $dbupdir      = "$basedir/sql/Pg-upgrade";
  my $dbupdir2     = "$basedir/sql/Pg-upgrade2";
  my $menufile     = "menu.ini";
 +my @javascript_dirs = ($basedir .'/js', $basedir .'/templates/webpages');
  my $submitsearch = qr/type\s*=\s*[\"\']?submit/i;
  our $self        = {};
  our $missing     = {};
  our @lost        = ();
  
 -my (%referenced_html_files, %locale, %htmllocale, %alllocales, %cached, %submit);
 +my (%referenced_html_files, %locale, %htmllocale, %alllocales, %cached, %submit, %jslocale);
  my ($ALL_HEADER, $MISSING_HEADER, $LOST_HEADER);
  
  init();
@@@ -124,10 -123,6 +124,10 @@@ handle_file($_, $dbupdir)  for @dbplfil
  handle_file($_, $dbupdir2) for @dbplfiles2;
  scanmenu($_)               for @menufiles;
  
 +for my $file_name (map({find_files($_)} @javascript_dirs)) {
 +  scan_javascript_file($file_name);
 +}
 +
  # merge entries to translate with entries from files 'missing' and 'lost'
  merge_texts();
  
@@@ -139,16 -134,6 +139,16 @@@ generate_file
    data_sub  => sub { _print_line($_, $self->{texts}{$_}, @_) for sort keys %alllocales },
  );
  
 +open(my $js_file, '>:encoding(utf8)', $locales_dir .'/js.js') || die;
 +print $js_file '{'."\n";
 +my $first_entry = 1;
 +for my $key (sort(keys(%jslocale))) {
 +  print $js_file (!$first_entry ? ',' : '') . _double_quote($key) .':'. _double_quote($self->{texts}{$key}) ."\n";
 +  $first_entry = 0;
 +}
 +print $js_file '}'."\n";
 +close($js_file);
 +
    foreach my $text (keys %$missing) {
      if ($locale{$text} || $htmllocale{$text}) {
        unless ($self->{texts}{$text}) {
@@@ -373,6 -358,13 +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.";
@@@ -400,7 -392,7 +407,7 @@@
        while ($rc) {
          if (/Locale/) {
            unless (/^use /) {
 -            my ($null, $country) = split /,/;
 +            my ($null, $country) = split(/,/);
              $country =~ s/^ +[\"\']//;
              $country =~ s/[\"\'].*//;
            }
@@@ -519,9 -511,11 +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::
@@@ -592,31 -586,6 +601,31 @@@
    $referenced_html_files{$_} = 1 for keys %{$cached{$file}{scanh}};
  }
  
 +sub scan_javascript_file {
 +  my ($file) = @_;
 +
 +  open(my $fh, $file) || die('can not open file: '. $file);
 +
 +  while( my $line = readline($fh) ) {
 +    while( $line =~ m/
 +                    kivi.t8
 +                    \s*
 +                    \(
 +                    \s*
 +                    ([\'\"])
 +                    (.*?)
 +                    (?<!\\)\1
 +                    /ixg )
 +    {
 +      my $text = unescape_template_string($2);
 +
 +      $jslocale{$text} = 1;
 +      $alllocales{$text} = 1;
 +    }
 +  }
 +
 +  close($fh);
 +}
  sub search_unused_htmlfiles {
    my @unscanned_dirs = ('../../templates/webpages');
  
@@@ -650,12 -619,6 +659,12 @@@ sub _single_quote 
    return  "'" . $val .  "'";
  }
  
 +sub _double_quote {
 +  my $val = shift;
 +  $val =~ s/(\"|\\$)/\\$1/g;
 +  return  '"'. $val .'"';
 +}
 +
  sub _print_line {
    my $key      = _single_quote(shift);
    my $text     = _single_quote(shift);