$OUTPUT_AUTOFLUSH = 1;
my $opt_v = 0;
-my $opt_n = 0;
my $opt_c = 0;
my $opt_f = 0;
my $debug = 0;
push @progfiles, map { m:^(.+)/([^/]+)$:; [ $2, $1 ] } grep { /\.pm$/ } map { find_files($_) } @progdirs;
-# put customized files into @customfiles
my %dir_h;
my @dbplfiles;
# merge entries to translate with entries from files 'missing' and 'lost'
merge_texts();
-# generate all
+# Generate "all" without translations in more_texts.
+# But keep the ones which are in both old_texts (texts) and more_texts,
+# because this are ones which are overwritten in more_texts for custom usage.
+my %to_keep;
+$to_keep{$_} = 1 for grep { !!$self->{more_texts}{$_} } keys %old_texts;
+my @new_all = grep { $to_keep{$_} || !$self->{more_texts}{$_} } sort keys %alllocales;
+
generate_file(
file => "$locales_dir/all",
header => $ALL_HEADER,
data_name => '$self->{texts}',
- data_sub => sub { _print_line($_, $self->{texts}{$_}, @_) for sort keys %alllocales },
+ data_sub => sub { _print_line($_, $self->{texts}{$_}, @_) for @new_all },
);
open(my $js_file, '>:encoding(utf8)', $javascript_output_dir .'/locale/'. $locale .'.js') || die;
print $js_file 'namespace("kivi").setupLocale({';
my $first_entry = 1;
for my $key (sort(keys(%jslocale))) {
- print $js_file ((!$first_entry ? ',' : '') ."\n". _double_quote($key) .':'. _double_quote($self->{texts}{$key}));
+ my $trans = $self->{more_texts}{$key} // $self->{texts}{$key};
+ print $js_file ((!$first_entry ? ',' : '') ."\n". _double_quote($key) .':'. _double_quote($trans));
$first_entry = 0;
}
print $js_file ("\n");
my ($opt_no_c, $ignore_for_compatiblity);
GetOptions(
- 'no-custom-files' => \$opt_n,
'check-files' => \$ignore_for_compatiblity,
'no-check-files' => \$opt_no_c,
'verbose' => \$opt_v,
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
+ -c, --check-files Run extended checks on HTML files (default)
+ -n, --no-check-files Do not 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
=over 8
-=item B<-n>, B<--no-custom-files>
-
-Do not process files whose name contains "_", e.g. "custom_io.pl".
-
=item B<-c>, B<--check-files>
Run extended checks on the usage of templates. This can be used to
discover HTML templates that are never used as well as the usage of
-non-existing HTML templates.
+non-existing HTML templates. This is enabled by default.
+
+=item B<-n>, B<--no-check-files>
+
+Do not run extended checks on the usage of templates. See
+C<--no-check-files>.
=item B<-v>, B<--verbose>