X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Flocales.pl;h=8faea2148592301b4c35ed7630455d0750d9723a;hb=ed83f90c4d4cd38c50a563c4f7d7075d0254b045;hp=d8df86296e7da21ab518dfd641e35be351576176;hpb=8e34e6dcc6e7b2734735170ef74272ec9495b779;p=kivitendo-erp.git diff --git a/scripts/locales.pl b/scripts/locales.pl index d8df86296..8faea2148 100755 --- a/scripts/locales.pl +++ b/scripts/locales.pl @@ -9,6 +9,13 @@ use utf8; use strict; +BEGIN { + use FindBin; + + unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML). + push (@INC, $FindBin::Bin . '/..'); +} + use Carp; use Cwd; use Data::Dumper; @@ -17,15 +24,19 @@ use File::Slurp qw(slurp); use FileHandle; use Getopt::Long; use IO::Dir; +use List::MoreUtils qw(apply); use List::Util qw(first); -use POSIX; use Pod::Usage; +use SL::DBUpgrade2; +use SL::System::Process; +use SL::YAML; $OUTPUT_AUTOFLUSH = 1; my $opt_v = 0; my $opt_n = 0; my $opt_c = 0; +my $opt_f = 0; my $debug = 0; parse_args(); @@ -35,7 +46,7 @@ my $basedir = "../.."; my $locales_dir = "."; my $bindir = "$basedir/bin/mozilla"; my @progdirs = ( "$basedir/SL" ); -my $menufile = "menu.ini"; +my @menufiles = glob("${basedir}/menus/*/*"); my @javascript_dirs = ($basedir .'/js', $basedir .'/templates/webpages'); my $javascript_output_dir = $basedir .'/js'; my $submitsearch = qr/type\s*=\s*[\"\']?submit/i; @@ -43,6 +54,11 @@ our $self = {}; our $missing = {}; our @lost = (); +my %ignore_unused_templates = ( + map { $_ => 1 } qw(ct/testpage.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); my ($ALL_HEADER, $MISSING_HEADER, $LOST_HEADER); @@ -85,19 +101,10 @@ my @customfiles = grep /_custom/, @bindir_files; push @progfiles, map { m:^(.+)/([^/]+)$:; [ $2, $1 ] } grep { /\.pm$/ } map { find_files($_) } @progdirs; # put customized files into @customfiles -my (@menufiles, %dir_h); - -if ($opt_n) { - @customfiles = (); - @menufiles = ($menufile); -} else { - tie %dir_h, 'IO::Dir', $basedir; - @menufiles = map { "$basedir/$_" } grep { /.*?_$menufile$/ } keys %dir_h; - unshift @menufiles, "$basedir/$menufile"; -} +my %dir_h; my @dbplfiles; -foreach my $sub_dir ("Pg-upgrade", "Pg-upgrade2", "Pg-upgrade2-auth") { +foreach my $sub_dir ("Pg-upgrade2", "Pg-upgrade2-auth") { my $dir = "$basedir/sql/$sub_dir"; tie %dir_h, 'IO::Dir', $dir; push @dbplfiles, map { [ $_, $dir ] } grep { /\.pl$/ } keys %dir_h; @@ -107,6 +114,18 @@ foreach my $sub_dir ("Pg-upgrade", "Pg-upgrade2", "Pg-upgrade2-auth") { if (-f "$locales_dir/all") { require "$locales_dir/all"; } +# load custom translation (more_texts) +for my $file (glob("${locales_dir}/more/*")) { + if (open my $in, "<", "$file") { + local $/ = undef; + my $code = <$in>; + eval($code); + close($in); + $self->{more_texts_temp}{$_} = $self->{more_texts}{$_} for keys %{ $self->{more_texts} }; + } +} +$self->{more_texts} = delete $self->{more_texts_temp}; + if (-f "$locales_dir/missing") { require "$locales_dir/missing" ; unlink "$locales_dir/missing"; @@ -116,16 +135,14 @@ if (-f "$locales_dir/lost") { unlink "$locales_dir/lost"; } -my $charset = slurp("$locales_dir/charset") || 'utf-8'; -chomp $charset; - my %old_texts = %{ $self->{texts} || {} }; handle_file(@{ $_ }) for @progfiles; handle_file(@{ $_ }) for @dbplfiles; scanmenu($_) for @menufiles; +scandbupgrades(); -for my $file_name (map({find_files($_)} @javascript_dirs)) { +for my $file_name (grep { /\.(?:js|html)$/i } map({find_files($_)} @javascript_dirs)) { scan_javascript_file($file_name); } @@ -161,7 +178,8 @@ close($js_file); # calc and generate missing -my @new_missing = grep { !$self->{texts}{$_} } sort keys %alllocales; +# don't add missing ones if we have a translation in more_texts +my @new_missing = grep { !$self->{more_texts}{$_} && !$self->{texts}{$_} } sort keys %alllocales; if (@new_missing) { if ($opt_c) { @@ -172,6 +190,17 @@ if (@new_missing) { } } + if ($opt_f) { + for my $string (@new_missing) { + print "new string '$string' in files:\n"; + print join "", + map { " $_\n" } + apply { s{^(?:\.\./)+}{} } + grep { $cached{$_}{all}{$string} } + keys %cached; + } + } + generate_file( file => "$locales_dir/missing", header => $MISSING_HEADER, @@ -234,15 +263,21 @@ EOL sub parse_args { my ($help, $man); + my ($opt_no_c, $ignore_for_compatiblity); + GetOptions( 'no-custom-files' => \$opt_n, - 'check-files' => \$opt_c, + 'check-files' => \$ignore_for_compatiblity, + 'no-check-files' => \$opt_no_c, 'verbose' => \$opt_v, + 'filenames' => \$opt_f, 'help' => \$help, 'man' => \$man, 'debug' => \$debug, ); + $opt_c = !$opt_no_c; + if ($help) { pod2usage(1); exit 0; @@ -368,7 +403,7 @@ sub scanfile { return unless (-f "$file"); my $fh = new FileHandle; - open $fh, "$file" or die "$! : $file"; + open $fh, '<:encoding(utf8)', $file or die "$! : $file"; my ($is_submit, $line_no, $sub_line_no) = (0, 0, 0); @@ -440,8 +475,11 @@ sub scanfile { } } - my ($found) = / (?: locale->text | \b t8 ) \b .*? \(/x; - $postmatch = "$'"; + my $found; + if (/ (?: locale->text | \b t8 ) \b .*? \(/x) { + $found = 1; + $postmatch = "$'"; + } if ($found) { my $string; @@ -494,24 +532,31 @@ sub scanfile { sub scanmenu { my $file = shift; - my $fh = new FileHandle; - open $fh, "$file" or die "$! : $file"; + my $menu = SL::YAML::LoadFile($file); - my @a = grep m/^\[/, <$fh>; - close($fh); + for my $node (@$menu) { + # possible for override files + next unless exists $node->{name}; + + $locale{$node->{name}} = 1; + $alllocales{$node->{name}} = 1; + $cached{$file}{all}{$node->{name}} = 1; + } +} - # strip [] - grep { s/(\[|\])//g } @a; +sub scandbupgrades { + # we only need to do this for auth atm, because only auth scripts can include new rights, which are translateable + my $auth = 1; - foreach my $item (@a) { - my @b = split /--/, $item; - foreach my $string (@b) { - chomp $string; + my $dbu = SL::DBUpgrade2->new(auth => $auth, path => SL::System::Process->exe_dir . '/sql/Pg-upgrade2-auth'); + + for my $upgrade ($dbu->sort_dbupdate_controls) { + for my $string (@{ $upgrade->{locales} || [] }) { $locale{$string} = 1; $alllocales{$string} = 1; + $cached{$upgrade->{tag}}{all}{$string} = 1; } } - } sub unescape_template_string { @@ -529,7 +574,7 @@ sub scanhtmlfile { my %plugins = ( 'loaded' => { }, 'needed' => { } ); - if (!open(IN, $file)) { + if (!open(IN, '<:encoding(utf8)', $file)) { print "E: template file '$file' not found\n"; return; } @@ -585,7 +630,7 @@ sub scanhtmlfile { } while ($line =~ m/\[\% # Template-Start-Tag - [\-~#]? # Whitespace-Unterdrückung + [\-~#]* # Whitespace-Unterdrückung \s* # Optional beliebig viele Whitespace (?: # Die erkannten Template-Direktiven PROCESS @@ -595,9 +640,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], ''; } @@ -623,11 +668,11 @@ sub scanhtmlfile { sub scan_javascript_file { my ($file) = @_; - open(my $fh, $file) || die('can not open file: '. $file); + open(my $fh, '<:encoding(utf8)', $file) || die('can not open file: '. $file); while( my $line = readline($fh) ) { while( $line =~ m/ - kivi.t8 + \bk(?:ivi)?.t8 \s* \( \s* @@ -655,7 +700,7 @@ sub search_unused_htmlfiles { if (-d $entry) { push @unscanned_dirs, $entry; - } elsif (($entry =~ /_master.html$/) && -f $entry && !$referenced_html_files{$entry}) { + } elsif (!$ignore_unused_templates{strip_base($entry)} && -f $entry && !$referenced_html_files{$entry}) { print "W: unused HTML template: " . strip_base($entry) . "\n"; } @@ -705,10 +750,7 @@ sub generate_file { open my $fh, '>:encoding(utf8)', $file or die "$! : $file"; - $charset =~ s/\r?\n//g; - my $emacs_charset = lc $charset; - - print $fh "#!/usr/bin/perl\n# -*- coding: $emacs_charset; -*-\n# vim: fenc=$charset\n\nuse utf8;\n\n"; + print $fh "#!/usr/bin/perl\n# -*- coding: utf-8; -*-\n# vim: fenc=utf-8\n\nuse utf8;\n\n"; print $fh $header, "\n" if $header; print $fh "$data_name = $delim[0]\n" if $data_name; @@ -718,11 +760,6 @@ sub generate_file { close $fh; } -sub slurp { - my $file = shift; - do { local ( @ARGV, $/ ) = $file; <> } -} - __END__ =head1 NAME @@ -736,6 +773,7 @@ locales.pl [options] lang_code Options: -n, --no-custom-files Do not process files whose name contains "_" -c, --check-files Run extended checks on HTML files + -f, --filenames Show the filenames where new strings where found -v, --verbose Be more verbose -h, --help Show this help @@ -761,7 +799,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