$basedir = "../..";
$bindir = "$basedir/bin/mozilla";
$dbupdir = "$basedir/sql/Pg-upgrade";
+$dbupdir2 = "$basedir/sql/Pg-upgrade2";
$menufile = "menu.ini";
$submitsearch = qr/type\s*=\s*[\"\']?submit/i;
}
opendir DIR, "$bindir" or die "$!";
-@progfiles = grep { /\.pl/; !/(_|^\.)/ } readdir DIR;
+@progfiles = grep { /\.pl$/ && !/(_|^\.)/ } readdir DIR;
seekdir DIR, 0;
@customfiles = grep /_/, readdir DIR;
closedir DIR;
@dbplfiles = grep { /\.pl$/ } readdir DIR;
closedir DIR;
+opendir DIR, $dbupdir2 or die "$!";
+@dbplfiles2 = grep { /\.pl$/ } readdir DIR;
+closedir DIR;
+
# slurp the translations in
if (-f 'all') {
require "all";
map({ handle_file($_, $bindir); } @progfiles);
map({ handle_file($_, $dbupdir); } @dbplfiles);
+map({ handle_file($_, $dbupdir2); } @dbplfiles2);
sub handle_file {
my ($file, $dir) = @_;
foreach $text (keys %$missing) {
if ($locale{$text} || $htmllocale{$text}) {
- unless ($self{texts}{$text}) {
- $self{texts}{$text} = $missing->{$text};
+ unless ($self->{texts}{$text}) {
+ $self->{texts}{$text} = $missing->{$text};
}
}
}
- my $localefile = $dir eq $bindir ? $file : "dbupgrade";
- open FH, ">$localefile" or die "$! : $localefile";
+ open FH, ">$file" or die "$! : $file";
- print FH q|$self{texts} = {
+ print FH q|$self->{texts} = {
|;
foreach $key (sort keys %locale) {
- if ($self{texts}{$key}) {
- $text = $self{texts}{$key};
+ if ($self->{texts}{$key}) {
+ $text = $self->{texts}{$key};
} else {
$text = $key;
}
print FH q|};
-$self{subs} = {
+$self->{subs} = {
|;
foreach $key (sort keys %subrt) {
}
foreach $key (sort keys %submit) {
- $text = ($self{texts}{$key}) ? $self{texts}{$key} : $key;
+ $text = ($self->{texts}{$key}) ? $self->{texts}{$key} : $key;
$text =~ s/'/\\'/g;
$text =~ s/\\$/\\\\/;
# you can add the translation in this file or in the 'missing' file
# run locales.pl from this directory to rebuild the translation files
-$self{texts} = {
+$self->{texts} = {
|;
foreach $key (sort keys %alllocales) {
- $text = $self{texts}{$key};
+ $text = $self->{texts}{$key};
$count++;
} elsif (($cur_char eq '"') || ($cur_char eq '\'')) {
$inside_string = $cur_char;
- } elsif ($cur_char eq ")") {
+ } elsif (($cur_char eq ")") || ($cur_char eq ',')) {
return ($text, substr($line, $pos + 1));
}
if (/require\s+\W.*\.pl/) {
my $newfile = $&;
$newfile =~ s/require\s+\W//;
- $newfile =~ s/\$form->{path}\///;
+ $newfile =~ s|bin/mozilla||;
# &scanfile("$bindir/$newfile", 0, $scanned_files);
$cached{$file}{scan}{"$bindir/$newfile"} = 1;
} elsif (/use\s+SL::(.*?);/) {
}
# is this a template call?
- if (/parse_html_template\s*\(\s*[\"\']([\w\/]+)/) {
+ if (/parse_html_template2?\s*\(\s*[\"\']([\w\/]+)/) {
my $newfile = "$basedir/templates/webpages/$1_master.html";
if (-f $newfile) {
# &scanhtmlfile($newfile);
if ($line =~ m|</translate>|i) {
$text .= $`;
substr($line, 0, $+[0]) = "";
-
+ $text =~ s/\s+/ /g;
+
$copying = 0;
if ($issubmit) {
# $submit{$text} = 1;
if ($line =~ m|</translate>|i) {
$text .= $`;
substr($line, 0, $+[0]) = "";
+ $text =~ s/\s+/ /g;
$copying = 0;
$alllocales{$text} = 1;
$htmllocale{$text} = 1;
- print(OUT $self{"texts"}{$text} || $text);
+ print(OUT $self->{"texts"}{$text} || $text);
print(OUT "\n") if ("" eq $line);
$text = "";