[Rt-commit] rt branch, 4.2/translation-updates, created. rt-4.1.5-210-g6e0005f

[Alex Vandiver]

The branch, 4.2/translation-updates has been created
        at  6e0005f3f17459b6cae8aa19de07e65be0e1a6ad (commit)

- Log -----------------------------------------------------------------
commit 758d3264d6135aa94cbf103b03f1fb46c84b474f
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Sun Dec 30 00:10:26 2012 -0500

    Broaden loc_qw parsing to parse "for (qw(a b c)) {\n"
    
    This particular construction is used in lib/RT/Report/Tickets.pm

diff --git a/devel/tools/extract-message-catalog b/devel/tools/extract-message-catalog
index 28efd11..cd28d92 100755
--- a/devel/tools/extract-message-catalog
+++ b/devel/tools/extract-message-catalog
@@ -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 ) {

commit a613145b3a7940cc3254790172b0e52300b77f0f
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Wed Mar 16 14:02:31 2011 -0400

    Don't concatenate loc'd strings, just use another parameter

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index 8f2f46b..2c08329 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -2645,8 +2645,7 @@ sub ProcessTicketReminders {
             }
 
             push @results, map {
-                loc( "Reminder '[_1]': ", $old_subject || $reminder->Subject )
-                  . $_
+                loc( "Reminder '[_1]': [_2]", $old_subject || $reminder->Subject, $_ )
             } @subresults;
         }
     }
@@ -2664,8 +2663,7 @@ sub ProcessTicketReminders {
         );
         if ( $status ) {
             push @results,
-              loc( "Reminder '[_1]': ", $args->{'NewReminder-Subject'} )
-              . loc("Created");
+              loc( "Reminder '[_1]': [_2]", $args->{'NewReminder-Subject'}, loc("Created") )
         }
         else {
             push @results, $msg;

commit 6e0005f3f17459b6cae8aa19de07e65be0e1a6ad
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Sun Dec 30 00:11:29 2012 -0500

    Fix an unintentional interpolation of $col in a locstring

diff --git a/lib/RT/Group.pm b/lib/RT/Group.pm
index 334314b..df0e957 100644
--- a/lib/RT/Group.pm
+++ b/lib/RT/Group.pm
@@ -1116,7 +1116,7 @@ sub _AddMember {
             CheckACL => 0,                  # don't check acl
             RecordTransaction => $args{'RecordTransaction'},
         );
-        return (0, $self->loc("Could not update column $col: [_1]", $msg))
+        return (0, $self->loc("Could not update column [_1]: [_2]", $col, $msg))
             unless $ok;
     }
 

-----------------------------------------------------------------------