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 FindBin;
+
+ unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
+ push (@INC, $FindBin::Bin . '/..');
}
use Carp;
use List::MoreUtils qw(apply);
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
+use SL::DBUpgrade2;
+use SL::System::Process;
+use SL::YAML;
$OUTPUT_AUTOFLUSH = 1;
my $locales_dir = ".";
my $bindir = "$basedir/bin/mozilla";
my @progdirs = ( "$basedir/SL" );
-my @menufiles = <"${basedir}/menus/*/*">;
+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;
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
+ 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)
);
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";
handle_file(@{ $_ }) for @progfiles;
handle_file(@{ $_ }) for @dbplfiles;
scanmenu($_) for @menufiles;
+scandbupgrades();
for my $file_name (grep { /\.(?:js|html)$/i } map({find_files($_)} @javascript_dirs)) {
scan_javascript_file($file_name);
# 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) {
sub scanmenu {
my $file = shift;
- print STDERR "trying to load file $file\n";
- my $menu = YAML::LoadFile($file);
+ my $menu = SL::YAML::LoadFile($file);
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;
+ }
+}
+
+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;
+
+ 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;
+ }
}
}
}
while ($line =~ m/\[\% # Template-Start-Tag
- [\-~#]? # Whitespace-Unterdrückung
+ [\-~#]* # Whitespace-Unterdrückung
\s* # Optional beliebig viele Whitespace
(?: # Die erkannten Template-Direktiven
PROCESS