[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.9-36-g3cf7a79

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  3cf7a796c4739bf7b198276452c7ece603388fca (commit)
       via  2ae390bfdbda0eb9732ea9ee5ae301a3beaf6c65 (commit)
      from  ce3b30c5b9670f5c269d682f2fabb90109fd7b2c (commit)

Summary of changes:
 etc/RT_Config.pm.in | 6 +++---
 lib/RT/Queue.pm     | 7 -------
 2 files changed, 3 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 2ae390bfdbda0eb9732ea9ee5ae301a3beaf6c65
Author: Christian Loos <cloos at netcologne.de>
Date:   Fri Sep 12 12:48:24 2014 +0200

    extract status loc strings from lifecycles instead of static list in Queue.pm

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index d43614d..d15036c 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2751,9 +2751,9 @@ Such a mapping is defined as follows:
 
 Set(%Lifecycles,
     default => {
-        initial         => [ 'new' ],
-        active          => [ 'open', 'stalled' ],
-        inactive        => [ 'resolved', 'rejected', 'deleted' ],
+        initial         => [qw(new)], # loc_qw
+        active          => [qw(open stalled)], # loc_qw
+        inactive        => [qw(resolved rejected deleted)], # loc_qw
 
         defaults => {
             on_create => 'new',
diff --git a/lib/RT/Queue.pm b/lib/RT/Queue.pm
index ea409ea..695c3bc 100644
--- a/lib/RT/Queue.pm
+++ b/lib/RT/Queue.pm
@@ -99,13 +99,6 @@ use RT::Groups;
 use RT::ACL;
 use RT::Interface::Email;
 
-# $self->loc('new'); # For the string extractor to get a string to localize
-# $self->loc('open'); # For the string extractor to get a string to localize
-# $self->loc('stalled'); # For the string extractor to get a string to localize
-# $self->loc('resolved'); # For the string extractor to get a string to localize
-# $self->loc('rejected'); # For the string extractor to get a string to localize
-# $self->loc('deleted'); # For the string extractor to get a string to localize
-
 __PACKAGE__->AddRight( General => SeeQueue            => 'View queue' ); # loc
 __PACKAGE__->AddRight( Admin   => AdminQueue          => 'Create, modify and delete queue' ); # loc
 __PACKAGE__->AddRight( Admin   => ShowACL             => 'Display Access Control List' ); # loc

commit 3cf7a796c4739bf7b198276452c7ece603388fca
Merge: ce3b30c 2ae390b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Nov 24 13:46:12 2014 -0500

    Merge branch '4.2/lifecycle-loc-from-config' into 4.2-trunk

diff --cc etc/RT_Config.pm.in
index 88df7b8,d15036c..ac026a7
mode 100644,100755..100644
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in

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