diff options
Diffstat (limited to 'rt/devel/tools/extract-message-catalog')
| -rw-r--r-- | rt/devel/tools/extract-message-catalog | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rt/devel/tools/extract-message-catalog b/rt/devel/tools/extract-message-catalog index 1533cfa61..b95c99047 100644 --- a/rt/devel/tools/extract-message-catalog +++ b/rt/devel/tools/extract-message-catalog @@ -3,7 +3,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -148,9 +148,9 @@ sub extract_strings_from_code { $_ = <_>; - # Mason filter: <&|/l>...</&> + # Mason filter: <&|/l>...</&> and <&|/l_unsafe>...</&> my $line = 1; - while (m!\G(.*?<&\|/l(.*?)&>(.*?)</&>)!sg) { + while (m!\G(.*?<&\|/l(?:_unsafe)?(.*?)&>(.*?)</&>)!sg) { my ( $all, $vars, $str ) = ( $1, $2, $3 ); $vars =~ s/[\n\r]//g; $line += ( $all =~ tr/\n/\n/ ); @@ -201,7 +201,7 @@ sub extract_strings_from_code { # Comment-based qw mark: "qw(...)" # loc_qw $line = 1; pos($_) = 0; - while (m/\G(.*?(?:qw\(([^)]+)\)[\}\)\],;]*)?$re_loc_qw_suffix)/smgo) { + while (m/\G(.*?(?:qw\(([^)]+)\)\s*[\{\}\)\],; ]*)?$re_loc_qw_suffix)/smgo) { my ( $all, $str ) = ( $1, $2 ); $line += ( $all =~ tr/\n/\n/ ); unless ( defined $str ) { |