projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fehler bei Umstellung von "use vars" auf "our"
[kivitendo-erp.git]
/
scripts
/
locales.pl
diff --git
a/scripts/locales.pl
b/scripts/locales.pl
index
24b0687
..
b972a49
100755
(executable)
--- a/
scripts/locales.pl
+++ b/
scripts/locales.pl
@@
-6,6
+6,7
@@
# this version of locles processes not only all required .pl files
# but also all parse_html_templated files.
# this version of locles processes not only all required .pl files
# but also all parse_html_templated files.
+use utf8;
use strict;
use Data::Dumper;
use strict;
use Data::Dumper;
@@
-30,6
+31,7
@@
parse_args();
my $basedir = "../..";
my $locales_dir = ".";
my $bindir = "$basedir/bin/mozilla";
my $basedir = "../..";
my $locales_dir = ".";
my $bindir = "$basedir/bin/mozilla";
+my @progdirs = ( "$basedir/SL/Controller", "$basedir/SL/Template/Plugin" );
my $dbupdir = "$basedir/sql/Pg-upgrade";
my $dbupdir2 = "$basedir/sql/Pg-upgrade2";
my $menufile = "menu.ini";
my $dbupdir = "$basedir/sql/Pg-upgrade";
my $dbupdir2 = "$basedir/sql/Pg-upgrade2";
my $menufile = "menu.ini";
@@
-41,11
+43,17
@@
my ($ALL_HEADER, $MISSING_HEADER, $LOST_HEADER);
init();
opendir DIR, "$bindir" or die "$!";
init();
opendir DIR, "$bindir" or die "$!";
-my @progfiles = grep { /\.pl$/ && !/(_custom|^\.)/ } readdir DIR;
+my @progfiles =
map { [ $_, $bindir ] }
grep { /\.pl$/ && !/(_custom|^\.)/ } readdir DIR;
seekdir DIR, 0;
my @customfiles = grep /_custom/, readdir DIR;
closedir DIR;
seekdir DIR, 0;
my @customfiles = grep /_custom/, readdir DIR;
closedir DIR;
+foreach my $dir (@progdirs) {
+ opendir DIR, $dir or die "$!";
+ push @progfiles, map { [ $_, $dir ] } grep { /\.pm$/ } readdir DIR;
+ closedir DIR;
+}
+
# put customized files into @customfiles
my @menufiles;
# put customized files into @customfiles
my @menufiles;
@@
-90,7
+98,7
@@
chomp $charset;
my %old_texts = %{ $self->{texts} || {} };
my %old_texts = %{ $self->{texts} || {} };
-map({ handle_file(
$_, $bindir
); } @progfiles);
+map({ handle_file(
@{ $_ }
); } @progfiles);
map({ handle_file($_, $dbupdir); } @dbplfiles);
map({ handle_file($_, $dbupdir2); } @dbplfiles2);
map({ handle_file($_, $dbupdir); } @dbplfiles);
map({ handle_file($_, $dbupdir2); } @dbplfiles2);
@@
-282,11
+290,11
@@
sub extract_text_between_parenthesis {
} else {
if ($quote_next) {
} else {
if ($quote_next) {
+ $text .= '\\' unless $cur_char eq "'";
$text .= $cur_char;
$quote_next = 0;
} elsif ($cur_char eq '\\') {
$text .= $cur_char;
$quote_next = 0;
} elsif ($cur_char eq '\\') {
- $text .= $cur_char;
$quote_next = 1;
} elsif ($cur_char eq $inside_string) {
$quote_next = 1;
} elsif ($cur_char eq $inside_string) {
@@
-323,6
+331,8
@@
sub scanfile {
my ($is_submit, $line_no, $sub_line_no) = (0, 0, 0);
while (<$fh>) {
my ($is_submit, $line_no, $sub_line_no) = (0, 0, 0);
while (<$fh>) {
+ last if /^\s*__END__/;
+
$line_no++;
# is this another file
$line_no++;
# is this another file
@@
-338,7
+348,7
@@
sub scanfile {
}
# is this a template call?
}
# is this a template call?
- if (/
parse_html_template2?
\s*\(\s*[\"\']([\w\/]+)\s*[\"\']/) {
+ if (/
(?:parse_html_template2?|render)
\s*\(\s*[\"\']([\w\/]+)\s*[\"\']/) {
my $newfile = "$basedir/templates/webpages/$1.html";
if (/parse_html_template2/) {
print "E: " . strip_base($file) . " is still using 'parse_html_template2' for " . strip_base($newfile) . ".\n";
my $newfile = "$basedir/templates/webpages/$1.html";
if (/parse_html_template2/) {
print "E: " . strip_base($file) . " is still using 'parse_html_template2' for " . strip_base($newfile) . ".\n";
@@
-474,26
+484,26
@@
sub scanhtmlfile {
while ($line =~ m/\[\%[^\w]*(\w+)\.\w+\(/g) {
my $plugin = $1;
while ($line =~ m/\[\%[^\w]*(\w+)\.\w+\(/g) {
my $plugin = $1;
- $plugins{needed}->{$plugin} = 1 if (first { $_ eq $plugin } qw(HTML LxERP JavaScript MultiColumnIterator));
+ $plugins{needed}->{$plugin} = 1 if (first { $_ eq $plugin } qw(HTML LxERP JavaScript MultiColumnIterator
L
));
}
while ($line =~ m/(?: # Start von Variante 1: LxERP.t8('...'); ohne darumliegende [% ... %]-Tags
(LxERP\.t8)\( # LxERP.t8( ::Parameter $1::
}
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::
- (.*?) # Der zu
ü
bersetzende String ::Parameter $3::
- (?<!\\)\2 # Ende des zu
ü
bersetzenden Strings
+ ([\'\"]) # Anfang des zu
ü
bersetzenden Strings ::Parameter $2::
+ (.*?) # Der zu
ü
bersetzende String ::Parameter $3::
+ (?<!\\)\2 # Ende des zu
ü
bersetzenden Strings
| # Start von Variante 2: [% '...' | $T8 %]
\[\% # Template-Start-Tag
| # Start von Variante 2: [% '...' | $T8 %]
\[\% # Template-Start-Tag
- [\-~#]? # Whitespace-Unterdr
ü
ckung
+ [\-~#]? # Whitespace-Unterdr
ü
ckung
\s* # Optional beliebig viele Whitespace
\s* # Optional beliebig viele Whitespace
- ([\'\"]) # Anfang des zu
ü
bersetzenden Strings ::Parameter $4::
- (.*?) # Der zu
ü
bersetzende String ::Parameter $5::
- (?<!\\)\4 # Ende des zu
ü
bersetzenden Strings
+ ([\'\"]) # Anfang des zu
ü
bersetzenden Strings ::Parameter $4::
+ (.*?) # Der zu
ü
bersetzende String ::Parameter $5::
+ (?<!\\)\4 # Ende des zu
ü
bersetzenden Strings
\s*\|\s* # Pipe-Zeichen mit optionalen Whitespace davor und danach
(\$T8) # Filteraufruf ::Parameter $6::
\s*\|\s* # Pipe-Zeichen mit optionalen Whitespace davor und danach
(\$T8) # Filteraufruf ::Parameter $6::
- .*? # Optionale Argumente f
ü
r den Filter
+ .*? # Optionale Argumente f
ü
r den Filter
\s* # Whitespaces
\s* # Whitespaces
- [\-~#]? # Whitespace-Unterdr
ü
ckung
+ [\-~#]? # Whitespace-Unterdr
ü
ckung
\%\] # Template-Ende-Tag
)
/ix) {
\%\] # Template-Ende-Tag
)
/ix) {
@@
-511,7
+521,7
@@
sub scanhtmlfile {
}
while ($line =~ m/\[\% # Template-Start-Tag
}
while ($line =~ m/\[\% # Template-Start-Tag
- [\-~#]? # Whitespace-Unterdr
ü
ckung
+ [\-~#]? # Whitespace-Unterdr
ü
ckung
\s* # Optional beliebig viele Whitespace
(?: # Die erkannten Template-Direktiven
PROCESS
\s* # Optional beliebig viele Whitespace
(?: # Die erkannten Template-Direktiven
PROCESS
@@
-576,7
+586,7
@@
sub strip_base {
sub _single_quote {
my $val = shift;
sub _single_quote {
my $val = shift;
- $val =~ s/('|\\$)/\\$1/g;
+ $val =~ s/(
\
'|\\$)/\\$1/g;
return "'" . $val . "'";
}
return "'" . $val . "'";
}
@@
-599,9
+609,12
@@
sub generate_file {
my $data_name = $params{data_name};
my @delim = split //, ($params{delim} || '{}');
my $data_name = $params{data_name};
my @delim = split //, ($params{delim} || '{}');
- open my $fh, '>', $file or die "$! : $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: $
charset; -*-\n# vim: fenc=$charset
\n\n";
+ print $fh "#!/usr/bin/perl\n# -*- coding: $
emacs_charset; -*-\n# vim: fenc=$charset\n\nuse utf8;
\n\n";
print $fh $header, "\n" if $header;
print $fh "$data_name = $delim[0]\n" if $data_name;
print $fh $header, "\n" if $header;
print $fh "$data_name = $delim[0]\n" if $data_name;