X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=build%2Fi18n-scan.pl;h=899d90d22c282ada2e203cc249a75a52aa51aa83;hp=3b61bc3843f2c027b1eed69e4ad9e9a81afd58ce;hb=0bfe064cc3f6c17cae6035d4a87066cdb6464078;hpb=e3ac0fd78d7fe7660954348675094d02d5f42aa0

diff --git a/build/i18n-scan.pl b/build/i18n-scan.pl
index 3b61bc384..899d90d22 100755
--- a/build/i18n-scan.pl
+++ b/build/i18n-scan.pl
@@ -12,10 +12,10 @@ my %stringtable;
 sub dec_lua_str
 {
 	my $s = shift;
+	$s =~ s/[\s\n]+/ /g;
 	$s =~ s/\\n/\n/g;
-	$s =~ s/\\t/\n/g;
+	$s =~ s/\\t/\t/g;
 	$s =~ s/\\(.)/$1/g;
-	$s =~ s/[\s\n]+/ /g;
 	$s =~ s/^ //;
 	$s =~ s/ $//;
 	return $s;
@@ -28,11 +28,12 @@ sub dec_tpl_str
 	$s =~ s/[\s\n]+/ /g;
 	$s =~ s/^ //;
 	$s =~ s/ $//;
+	$s =~ s/\\/\\\\/g;
 	return $s;
 }
 
 
-if( open F, "find @ARGV -type f '(' -name '*.htm' -or -name '*.lua' ')' |" )
+if( open F, "find @ARGV -type f '(' -name '*.htm' -o -name '*.lua' ')' |" )
 {
 	while( defined( my $file = readline F ) )
 	{
@@ -50,29 +51,50 @@ if( open F, "find @ARGV -type f '(' -name '*.htm' -or -name '*.lua' ')' |" )
 			while( $text =~ s/ ^ .*? (?:translate|translatef|i18n|_) [\n\s]* \( /(/sgx )
 			{
 				( my $code, $text ) = extract_bracketed($text, q{('")});
-				$code =~ s/^\(//; $code =~ s/\)$//;
+
+				$code =~ s/\\\n/ /g;
+				$code =~ s/^\([\n\s]*//;
+				$code =~ s/[\n\s]*\)$//;
 
 				my $res = "";
 				my $sub = "";
 
-				while( defined $sub )
+				if( $code =~ /^['"]/ )
 				{
-					( $sub, $code ) = extract_delimited($code, q{'"}, q{\s*(?:\.\.\s*)?});
-
-					if( defined $sub )
+					while( defined $sub )
 					{
-						$res .= substr $sub, 1, length($sub) - 2;
+						( $sub, $code ) = extract_delimited($code, q{'"}, q{\s*(?:\.\.\s*)?});
+
+						if( defined $sub && length($sub) > 2 )
+						{
+							$res .= substr $sub, 1, length($sub) - 2;
+						}
+						else
+						{
+							undef $sub;
+						}
 					}
 				}
+				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);
-				$stringtable{$res}++;
+				$stringtable{$res}++ if $res;
 			}
 
 
 			$text = $raw;
 
-			while( $text =~ s/ ^ .*? <% [:_] -? /<%/sgx )
+			while( $text =~ s/ ^ .*? <% -? [:_] /<%/sgx )
 			{
 				( my $code, $text ) = extract_tagged($text, '<%', '%>');