projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move svc_circuit from Access to Telephony
[freeside.git]
/
rt
/
devel
/
tools
/
extract-message-catalog
diff --git
a/rt/devel/tools/extract-message-catalog
b/rt/devel/tools/extract-message-catalog
index
1533cfa
..
0afec0b
100644
(file)
--- a/
rt/devel/tools/extract-message-catalog
+++ b/
rt/devel/tools/extract-message-catalog
@@
-3,7
+3,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
4
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <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;
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/ );
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;
# 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 ) {
my ( $all, $str ) = ( $1, $2 );
$line += ( $all =~ tr/\n/\n/ );
unless ( defined $str ) {