build: fix some errors in i18n-scan.pl, support bracketed Lua string notation
This commit is contained in:
parent
3e9e883c15
commit
4ab2d1017e
1 changed files with 26 additions and 10 deletions
|
@ -12,10 +12,10 @@ my %stringtable;
|
||||||
sub dec_lua_str
|
sub dec_lua_str
|
||||||
{
|
{
|
||||||
my $s = shift;
|
my $s = shift;
|
||||||
$s =~ s/\\n/\n/g;
|
|
||||||
$s =~ s/\\t/\n/g;
|
|
||||||
$s =~ s/\\(.)/$1/g;
|
|
||||||
$s =~ s/[\s\n]+/ /g;
|
$s =~ s/[\s\n]+/ /g;
|
||||||
|
$s =~ s/\\n/\n/g;
|
||||||
|
$s =~ s/\\t/\t/g;
|
||||||
|
$s =~ s/\\(.)/$1/g;
|
||||||
$s =~ s/^ //;
|
$s =~ s/^ //;
|
||||||
$s =~ s/ $//;
|
$s =~ s/ $//;
|
||||||
return $s;
|
return $s;
|
||||||
|
@ -50,23 +50,39 @@ if( open F, "find @ARGV -type f '(' -name '*.htm' -o -name '*.lua' ')' |" )
|
||||||
while( $text =~ s/ ^ .*? (?:translate|translatef|i18n|_) [\n\s]* \( /(/sgx )
|
while( $text =~ s/ ^ .*? (?:translate|translatef|i18n|_) [\n\s]* \( /(/sgx )
|
||||||
{
|
{
|
||||||
( my $code, $text ) = extract_bracketed($text, q{('")});
|
( my $code, $text ) = extract_bracketed($text, q{('")});
|
||||||
$code =~ s/^\(//; $code =~ s/\)$//;
|
|
||||||
|
$code =~ s/^\([\n\s]*//;
|
||||||
|
$code =~ s/[\n\s]*\)$//;
|
||||||
|
|
||||||
my $res = "";
|
my $res = "";
|
||||||
my $sub = "";
|
my $sub = "";
|
||||||
|
|
||||||
while( defined $sub )
|
if( $code =~ /^['"]/ )
|
||||||
{
|
{
|
||||||
( $sub, $code ) = extract_delimited($code, q{'"}, q{\s*(?:\.\.\s*)?});
|
while( defined $sub )
|
||||||
|
|
||||||
if( defined $sub )
|
|
||||||
{
|
{
|
||||||
$res .= substr $sub, 1, length($sub) - 2;
|
( $sub, $code ) = extract_delimited($code, q{'"}, q{\s*(?:\.\.\s*)?});
|
||||||
|
|
||||||
|
if( defined $sub )
|
||||||
|
{
|
||||||
|
$res .= substr $sub, 1, length($sub) - 2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
elsif( $code =~ /^(\[=*\[)/ )
|
||||||
|
{
|
||||||
|
my $stag = quotemeta $1;
|
||||||
|
my $etag = $stag;
|
||||||
|
$etag =~ s/\[/]/g;
|
||||||
|
|
||||||
|
( $res ) = extract_tagged($code, $stag, $etag);
|
||||||
|
|
||||||
|
$res =~ s/^$stag//;
|
||||||
|
$res =~ s/$etag$//;
|
||||||
|
}
|
||||||
|
|
||||||
$res = dec_lua_str($res);
|
$res = dec_lua_str($res);
|
||||||
$stringtable{$res}++;
|
$stringtable{$res}++ if $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue