projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rechte: SL::Auth::all_rights() -> $::auth->all_rights
[kivitendo-erp.git]
/
scripts
/
locales.pl
diff --git
a/scripts/locales.pl
b/scripts/locales.pl
index
e63b1b7
..
ec9624a
100755
(executable)
--- a/
scripts/locales.pl
+++ b/
scripts/locales.pl
@@
-9,6
+9,11
@@
use utf8;
use strict;
use utf8;
use strict;
+BEGIN {
+ unshift(@INC, 'modules/override'); # Use our own versions of various modules (e.g. YAML).
+ push (@INC, 'modules/fallback'); # Only use our own versions of modules if there's no system version.
+}
+
use Carp;
use Cwd;
use Data::Dumper;
use Carp;
use Cwd;
use Data::Dumper;
@@
-17,14
+22,18
@@
use File::Slurp qw(slurp);
use FileHandle;
use Getopt::Long;
use IO::Dir;
use FileHandle;
use Getopt::Long;
use IO::Dir;
+use List::MoreUtils qw(apply);
use List::Util qw(first);
use Pod::Usage;
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;
my $opt_v = 0;
my $opt_n = 0;
my $opt_c = 0;
$OUTPUT_AUTOFLUSH = 1;
my $opt_v = 0;
my $opt_n = 0;
my $opt_c = 0;
+my $opt_f = 0;
my $debug = 0;
parse_args();
my $debug = 0;
parse_args();
@@
-34,7
+43,7
@@
my $basedir = "../..";
my $locales_dir = ".";
my $bindir = "$basedir/bin/mozilla";
my @progdirs = ( "$basedir/SL" );
my $locales_dir = ".";
my $bindir = "$basedir/bin/mozilla";
my @progdirs = ( "$basedir/SL" );
-my @menufiles =
("${basedir}/menu.ini", "${basedir}/admin-menu.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;
my @javascript_dirs = ($basedir .'/js', $basedir .'/templates/webpages');
my $javascript_output_dir = $basedir .'/js';
my $submitsearch = qr/type\s*=\s*[\"\']?submit/i;
@@
-43,7
+52,8
@@
our $missing = {};
our @lost = ();
my %ignore_unused_templates = (
our @lost = ();
my %ignore_unused_templates = (
- map { $_ => 1 } qw(common/help_overlay.html ct/testpage.html generic/autocomplete.html oe/periodic_invoices_email.txt part/testpage.html t/render.html t/render.js)
+ 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);
);
my (%referenced_html_files, %locale, %htmllocale, %alllocales, %cached, %submit, %jslocale);
@@
-90,13
+100,6
@@
push @progfiles, map { m:^(.+)/([^/]+)$:; [ $2, $1 ] } grep { /\.pm$/ } map { fi
# put customized files into @customfiles
my %dir_h;
# 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";
my @dbplfiles;
foreach my $sub_dir ("Pg-upgrade2", "Pg-upgrade2-auth") {
my $dir = "$basedir/sql/$sub_dir";
@@
-123,7
+126,7
@@
handle_file(@{ $_ }) for @progfiles;
handle_file(@{ $_ }) for @dbplfiles;
scanmenu($_) for @menufiles;
handle_file(@{ $_ }) for @dbplfiles;
scanmenu($_) for @menufiles;
-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);
}
scan_javascript_file($file_name);
}
@@
-170,6
+173,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,
generate_file(
file => "$locales_dir/missing",
header => $MISSING_HEADER,
@@
-239,6
+253,7
@@
sub parse_args {
'check-files' => \$ignore_for_compatiblity,
'no-check-files' => \$opt_no_c,
'verbose' => \$opt_v,
'check-files' => \$ignore_for_compatiblity,
'no-check-files' => \$opt_no_c,
'verbose' => \$opt_v,
+ 'filenames' => \$opt_f,
'help' => \$help,
'man' => \$man,
'debug' => \$debug,
'help' => \$help,
'man' => \$man,
'debug' => \$debug,
@@
-371,7
+386,7
@@
sub scanfile {
return unless (-f "$file");
my $fh = new FileHandle;
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);
my ($is_submit, $line_no, $sub_line_no) = (0, 0, 0);
@@
-500,24
+515,13
@@
sub scanfile {
sub scanmenu {
my $file = shift;
sub scanmenu {
my $file = shift;
- my $fh = new FileHandle;
- open $fh, "$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 {
}
sub unescape_template_string {
@@
-535,7
+539,7
@@
sub scanhtmlfile {
my %plugins = ( 'loaded' => { }, 'needed' => { } );
my %plugins = ( 'loaded' => { }, 'needed' => { } );
- if (!open(IN, $file)) {
+ if (!open(IN,
'<:encoding(utf8)',
$file)) {
print "E: template file '$file' not found\n";
return;
}
print "E: template file '$file' not found\n";
return;
}
@@
-601,9
+605,9
@@
sub scanhtmlfile {
\s+ # Mindestens ein Whitespace
[\'\"]? # Anfang des Dateinamens
([^\s]+) # Beliebig viele Nicht-Whitespaces -- Dateiname
\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) {
/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], '';
}
$cached{$file}{scanh}{$new_file_name} = 1;
substr $line, $LAST_MATCH_START[1], $LAST_MATCH_END[0] - $LAST_MATCH_START[0], '';
}
@@
-629,11
+633,11
@@
sub scanhtmlfile {
sub scan_javascript_file {
my ($file) = @_;
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/
while( my $line = readline($fh) ) {
while( $line =~ m/
-
kivi
.t8
+
\bk(?:ivi)?
.t8
\s*
\(
\s*
\s*
\(
\s*
@@
-734,6
+738,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
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
-v, --verbose Be more verbose
-h, --help Show this help
@@
-759,7
+764,7
@@
Be more verbose.
=head1 DESCRIPTION
=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
HTML templates and puts them into the file "all" for translation.
=cut