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 FileHandle;
use Getopt::Long;
use IO::Dir;
+use List::MoreUtils qw(apply);
use List::Util qw(first);
-use POSIX;
use Pod::Usage;
$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 $locales_dir = ".";
my $bindir = "$basedir/bin/mozilla";
my @progdirs = ( "$basedir/SL" );
-my $dbupdir = "$basedir/sql/Pg-upgrade";
-my $dbupdir2 = "$basedir/sql/Pg-upgrade2";
-my $menufile = "menu.ini";
+my @menufiles = <${basedir}/menus/*.ini>;
my @javascript_dirs = ($basedir .'/js', $basedir .'/templates/webpages');
my $javascript_output_dir = $basedir .'/js';
my $submitsearch = qr/type\s*=\s*[\"\']?submit/i;
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
+ failed_background_jobs_report/email.txt)
+);
+
my (%referenced_html_files, %locale, %htmllocale, %alllocales, %cached, %submit, %jslocale);
my ($ALL_HEADER, $MISSING_HEADER, $LOST_HEADER);
push @progfiles, map { m:^(.+)/([^/]+)$:; [ $2, $1 ] } grep { /\.pm$/ } map { find_files($_) } @progdirs;
# put customized files into @customfiles
-my (@menufiles, %dir_h);
+my %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";
+ push @menufiles, map { "$basedir/$_" } grep { /.*_menu.ini$/ } keys %dir_h;
}
-tie %dir_h, 'IO::Dir', $dbupdir;
-my @dbplfiles = grep { /\.pl$/ } keys %dir_h;
-
-tie %dir_h, 'IO::Dir', $dbupdir2;
-my @dbplfiles2 = grep { /\.pl$/ } keys %dir_h;
+my @dbplfiles;
+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;
+}
# slurp the translations in
if (-f "$locales_dir/all") {
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($_, $dbupdir) for @dbplfiles;
-handle_file($_, $dbupdir2) for @dbplfiles2;
+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);
}
my @new_missing = grep { !$self->{texts}{$_} } sort keys %alllocales;
if (@new_missing) {
+ if ($opt_c) {
+ my %existing_lc = map { (lc $_ => $_) } grep { $self->{texts}->{$_} } keys %{ $self->{texts} };
+ foreach my $entry (@new_missing) {
+ my $other = $existing_lc{lc $entry};
+ print "W: No entry for '${entry}' exists, but there is one with different case: '${other}'\n" if $other;
+ }
+ }
+
+ 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,
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;
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 ($found) = / (?: locale->text | \b t8 ) \b .*? \(/x;
- $postmatch = "$'";
+ my $found;
+ if (/ (?: locale->text | \b t8 ) \b .*? \(/x) {
+ $found = 1;
+ $postmatch = "$'";
+ }
if ($found) {
my $string;
my $file = shift;
my $fh = new FileHandle;
- open $fh, "$file" or die "$! : $file";
+ open $fh, '<:encoding(utf8)', $file or die "$! : $file";
my @a = grep m/^\[/, <$fh>;
close($fh);
my %plugins = ( 'loaded' => { }, 'needed' => { } );
- if (!open(IN, $file)) {
+ if (!open(IN, '<:encoding(utf8)', $file)) {
print "E: template file '$file' not found\n";
return;
}
\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], '';
}
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*
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";
}
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;
close $fh;
}
-sub slurp {
- my $file = shift;
- do { local ( @ARGV, $/ ) = $file; <> }
-}
-
__END__
=head1 NAME
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