[Rt-commit] r13569 - in rt/3.8/trunk: sbin

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Tue Jun 24 16:15:08 2008
New Revision: 13569

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/sbin/extract-message-catalog

Log:
 r13774 at sunnavys-mb:  sunnavy | 2008-06-25 03:16:46 +0800
 colon should be permitted between string and "#loc" or "#loc_pair"


Modified: rt/3.8/trunk/sbin/extract-message-catalog
==============================================================================
--- rt/3.8/trunk/sbin/extract-message-catalog	(original)
+++ rt/3.8/trunk/sbin/extract-message-catalog	Tue Jun 24 16:15:08 2008
@@ -155,7 +155,7 @@
     # Comment-based mark: "..." # loc
     $line = 1;
     pos($_) = 0;
-    while (m/\G.*?($RE{delimited}{-delim=>q{'"}}{-keep})[\}\)\],]*\s*\#\s*loc\s*$/smg) {
+    while (m/\G.*?($RE{delimited}{-delim=>q{'"}}{-keep})[\}\)\],;]*\s*\#\s*loc\s*$/smg) {
 	my $str = substr($1, 1, -1);
 	$line += ( () = ( $& =~ /\n/g ) );    # cryptocontext!
 	$str  =~ s/\\'/\'/g;
@@ -165,7 +165,7 @@
     # Comment-based pair mark: "..." => "..." # loc_pair
     $line = 1;
     pos($_) = 0;
-    while (m/\G.*?(\w+)\s*=>\s*($RE{delimited}{-delim=>q{'"}}{-keep})[\}\)\],]*\s*\#\s*loc_pair\s*$/smg) {
+    while (m/\G.*?(\w+)\s*=>\s*($RE{delimited}{-delim=>q{'"}}{-keep})[\}\)\],;]*\s*\#\s*loc_pair\s*$/smg) {
 	my $key = $1;
 	my $val = substr($2, 1, -1);
 	$line += ( () = ( $& =~ /\n/g ) );    # cryptocontext!