X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FReport%2FTickets.pm;h=b73bbaaa3a8d38a29ee049f6db14fa18ebe47f81;hb=7588a4ac90a9b07c08a3107cd1107d773be1c991;hp=de40dbdd40d809d6c581b43ed1377f97a2f54668;hpb=98d2b25256055abb0dfcb9f586b434474fa97afd;p=freeside.git diff --git a/rt/lib/RT/Report/Tickets.pm b/rt/lib/RT/Report/Tickets.pm index de40dbdd4..b73bbaaa3 100644 --- a/rt/lib/RT/Report/Tickets.pm +++ b/rt/lib/RT/Report/Tickets.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC # # # (Except where explicitly superseded by other copyright notices) @@ -57,22 +57,27 @@ use warnings; sub Groupings { my $self = shift; my %args = (@_); - my @fields = map {$_, $_} qw( - Status - Queue - ); - - foreach my $type ( qw(Owner Creator LastUpdatedBy Requestor Cc AdminCc Watcher) ) { - push @fields, $type.' '.$_, $type.'.'.$_ foreach qw( - Name EmailAddress RealName NickName Organization Lang City Country Timezone - ); + my @fields = + map { $self->CurrentUser->loc($_), $_ } qw( Status Queue ); # loc_qw + + foreach my $type ( qw(Owner Creator LastUpdatedBy Requestor Cc AdminCc Watcher) ) { # loc_qw + for my $field ( + qw( Name EmailAddress RealName NickName Organization Lang City Country Timezone ) # loc_qw + ) + { + push @fields, + $self->CurrentUser->loc($type) . ' ' + . $self->CurrentUser->loc($field), $type . '.' . $field; + } } - for my $field (qw(Due Resolved Created LastUpdated Started Starts Told)) { - for my $frequency (qw(Hourly Daily Monthly Annually)) { - my $item = $field.$frequency; - push @fields, $item, $item; + for my $field (qw(Due Resolved Created LastUpdated Started Starts Told)) { # loc_qw + for my $frequency (qw(Hourly Daily Monthly Annually)) { # loc_qw + push @fields, + $self->CurrentUser->loc($field) + . $self->CurrentUser->loc($frequency), + $field . $frequency; } } @@ -93,7 +98,11 @@ sub Groupings { } $CustomFields->LimitToGlobal; while ( my $CustomField = $CustomFields->Next ) { - push @fields, "Custom field '". $CustomField->Name ."'", "CF.{". $CustomField->id ."}"; + push @fields, $self->CurrentUser->loc( + "Custom field '[_1]'", + $CustomField->Name + ), + "CF.{" . $CustomField->id . "}"; } } return @fields;