diff options
author | Ivan Kohler <ivan@freeside.biz> | 2013-06-04 00:16:28 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2013-06-04 00:16:28 -0700 |
commit | 7588a4ac90a9b07c08a3107cd1107d773be1c991 (patch) | |
tree | 55b8bedb5f899e705da0ba7f608267943bf89e94 /rt/devel | |
parent | 98d2b25256055abb0dfcb9f586b434474fa97afd (diff) |
RT 4.0.13
Diffstat (limited to 'rt/devel')
-rw-r--r-- | rt/devel/tools/change-loc-msgstr | 2 | ||||
-rw-r--r-- | rt/devel/tools/extract-message-catalog | 8 | ||||
-rw-r--r-- | rt/devel/tools/factory | 3 | ||||
-rw-r--r-- | rt/devel/tools/license_tag | 10 | ||||
-rw-r--r-- | rt/devel/tools/merge-rosetta.pl | 4 | ||||
-rw-r--r-- | rt/devel/tools/rt-attributes-editor | 2 | ||||
-rw-r--r-- | rt/devel/tools/tweak-template-locstring | 3 |
7 files changed, 19 insertions, 13 deletions
diff --git a/rt/devel/tools/change-loc-msgstr b/rt/devel/tools/change-loc-msgstr index 75fc72df7..9eb9ac697 100644 --- a/rt/devel/tools/change-loc-msgstr +++ b/rt/devel/tools/change-loc-msgstr @@ -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) 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 ) { diff --git a/rt/devel/tools/factory b/rt/devel/tools/factory index 099d2db8c..5f9c49b46 100644 --- a/rt/devel/tools/factory +++ b/rt/devel/tools/factory @@ -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) @@ -47,6 +47,7 @@ # # END BPS TAGGED BLOCK }}} use strict; +use warnings; use DBI; die "Usage: $0 database namespace" if @ARGV != 2; diff --git a/rt/devel/tools/license_tag b/rt/devel/tools/license_tag index de3bd3bc3..05bcf83e9 100644 --- a/rt/devel/tools/license_tag +++ b/rt/devel/tools/license_tag @@ -5,7 +5,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) @@ -48,11 +48,13 @@ # those contributions and any derivatives thereof. # # END BPS TAGGED BLOCK }}} +use strict; +use warnings; my $LICENSE = <<'EOL'; 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) @@ -113,7 +115,7 @@ tag_makefile ('README'); sub tag_mason { my $pm = $_; return unless (-f $pm); - return if $pm =~ /images/ || $pm =~ /\.(?:png|jpe?g|gif)$/; + return if $pm =~ /\.(?:png|jpe?g|gif)$/; open( FILE, '<', $pm ) or die "Failed to open $pm"; my $file = (join "", <FILE>); close (FILE); @@ -252,7 +254,7 @@ sub another_license { my $name = shift; my $file = shift; - return 1 if ($name =~ /(?:FCKEditor|scriptaculous|superfish|tablesorter|farbtastic)/i); + return 1 if ($name =~ /(?:ckeditor|scriptaculous|superfish|tablesorter|farbtastic)/i); return 0 if $file =~ /Copyright\s+\(c\)\s+\d\d\d\d-\d\d\d\d Best Practical Solutions/i; return 1 if $file =~ /\b(copyright|GPL|Public Domain)\b/i; # common diff --git a/rt/devel/tools/merge-rosetta.pl b/rt/devel/tools/merge-rosetta.pl index e3b45a1ac..a0ef3e2a7 100644 --- a/rt/devel/tools/merge-rosetta.pl +++ b/rt/devel/tools/merge-rosetta.pl @@ -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) @@ -46,4 +46,6 @@ # those contributions and any derivatives thereof. # # END BPS TAGGED BLOCK }}} +use strict; +use warnings; exec('sbin/rt-message-catalog', 'rosetta', @ARGV); diff --git a/rt/devel/tools/rt-attributes-editor b/rt/devel/tools/rt-attributes-editor index 92caeaf12..d3443177a 100644 --- a/rt/devel/tools/rt-attributes-editor +++ b/rt/devel/tools/rt-attributes-editor @@ -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) diff --git a/rt/devel/tools/tweak-template-locstring b/rt/devel/tools/tweak-template-locstring index 7f8a8808f..d77ef9e94 100644 --- a/rt/devel/tools/tweak-template-locstring +++ b/rt/devel/tools/tweak-template-locstring @@ -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) @@ -47,6 +47,7 @@ # # END BPS TAGGED BLOCK }}} use strict; +use warnings; # run this script with: # perl -0pi sbin/tweak-template-locstring `ack -f share/html -G 'html$'` s!\<\&\|\/l([^&]*)\&\>[\n\s]+(.*?)[\n\s]*\<\/\&\>!;my ($arg, $x) = ($1, $2); $x =~ s/\s*\n\s*/ /g;"<&|/l$arg&>$x</&>"!smge; |