[Rt-commit] r13981 - in rt/3.8/trunk: . share/html/Elements share/html/Elements/CollectionAsTable share/html/Elements/RT__Group share/html/Elements/RT__Queue share/html/Elements/RT__Scrip share/html/Elements/RT__Ticket share/html/Elements/RT__User
elacour at bestpractical.com
elacour at bestpractical.com
Fri Jul 11 03:34:50 EDT 2008
Author: elacour
Date: Fri Jul 11 03:34:49 2008
New Revision: 13981
Modified:
rt/3.8/trunk/ (props changed)
rt/3.8/trunk/share/html/Elements/CollectionAsTable/Header
rt/3.8/trunk/share/html/Elements/ColumnMap
rt/3.8/trunk/share/html/Elements/RT__Group/ColumnMap
rt/3.8/trunk/share/html/Elements/RT__Queue/ColumnMap
rt/3.8/trunk/share/html/Elements/RT__Scrip/ColumnMap
rt/3.8/trunk/share/html/Elements/RT__Template/ColumnMap
rt/3.8/trunk/share/html/Elements/RT__Ticket/ColumnMap
rt/3.8/trunk/share/html/Elements/RT__User/ColumnMap
Log:
r9987 at datura: manu | 2008-07-11 09:34:33 +0200
Better fix for table header localization (# loc in ColumnMaps, then
localization at display time in CollectionAsTable/Header).
Still missing loc for %LINKTYPEMAP thought.
Modified: rt/3.8/trunk/share/html/Elements/CollectionAsTable/Header
==============================================================================
--- rt/3.8/trunk/share/html/Elements/CollectionAsTable/Header (original)
+++ rt/3.8/trunk/share/html/Elements/CollectionAsTable/Header Fri Jul 11 03:34:49 2008
@@ -99,7 +99,7 @@
);
unless( $tmp ) {
- $title = loc($m->comp('/Elements/ScrubHTML', Content => $title));
+ $title = $m->comp('/Elements/ScrubHTML', Content => $title);
} else {
if ( UNIVERSAL::isa( $tmp, 'CODE' ) ) {
my @tmp = $tmp->( $title );
@@ -135,11 +135,11 @@
%$generic_query_args,
OrderBy => $attr, Order => $new_order
)
- . '">'. $title .'</a>'
+ . '">'. loc($title) .'</a>'
);
}
else {
- $m->out( $title );
+ $m->out( loc($title) );
}
$m->out('</th>');
}
Modified: rt/3.8/trunk/share/html/Elements/ColumnMap
==============================================================================
--- rt/3.8/trunk/share/html/Elements/ColumnMap (original)
+++ rt/3.8/trunk/share/html/Elements/ColumnMap Fri Jul 11 03:34:49 2008
@@ -56,39 +56,39 @@
my $COLUMN_MAP = {
id => {
attribute => 'id',
- tiitle => loc('id'),
+ title => 'id', # loc
align => 'right',
value => sub { return $_[0]->id }
},
Created => {
attribute => 'Created',
- title => loc('Created'),
+ title => 'Created', # loc
value => sub { return $_[0]->CreatedObj->AsString }
},
CreatedRelative => {
attribute => 'Created',
- title => loc('Created'),
+ title => 'Created', # loc
value => sub { return $_[0]->CreatedObj->AgeAsString }
},
CreatedBy => {
attribute => 'CreatedBy',
- title => loc('Created By'),
+ title => 'Created By', # loc
value => sub { return $_[0]->CreatorObj->Name }
},
LastUpdated => {
attribute => 'LastUpdated',
- title => loc('Last Updated'),
+ title => 'Last Updated', # loc
value => sub { return $_[0]->LastUpdatedObj->AsString }
},
LastUpdatedRelative => {
attribute => 'LastUpdated',
- title => loc('Last Updated'),
+ title => 'Last Updated', # loc
value => sub { return $_[0]->LastUpdatedObj->AgeAsString }
},
LastUpdatedBy => {
attribute => 'LastUpdatedBy',
- title => loc('Last Updated By'),
+ title => 'Last Updated By', # loc
value => sub { return $_[0]->LastUpdatedByObj->Name }
},
Modified: rt/3.8/trunk/share/html/Elements/RT__Group/ColumnMap
==============================================================================
--- rt/3.8/trunk/share/html/Elements/RT__Group/ColumnMap (original)
+++ rt/3.8/trunk/share/html/Elements/RT__Group/ColumnMap Fri Jul 11 03:34:49 2008
@@ -52,13 +52,13 @@
<%ONCE>
my $COLUMN_MAP = {
id => {
- title => loc('#'),
+ title => '#', # loc
attribute => 'id',
align => 'right',
value => sub { return $_[0]->id },
},
HasMember => {
- title => loc('Member'),
+ title => 'Member', # loc
value => sub {
my $group = $_[0];
my $uid = $_[2] || return '';
@@ -66,7 +66,7 @@
},
},
HasMemberRecursively => {
- title => loc('Recursive member'),
+ title => 'Recursive member', # loc
value => sub {
my $group = $_[0];
my $uid = $_[2] || return '';
@@ -74,12 +74,12 @@
},
},
Name => {
- title => loc('Name'),
+ title => 'Name', # loc
attribute => 'Name',
value => sub { return $_[0]->Name() },
},
Description => {
- title => loc('Description'),
+ title => 'Description', # loc
attribute => 'Description',
value => sub { return $_[0]->Description() },
},
Modified: rt/3.8/trunk/share/html/Elements/RT__Queue/ColumnMap
==============================================================================
--- rt/3.8/trunk/share/html/Elements/RT__Queue/ColumnMap (original)
+++ rt/3.8/trunk/share/html/Elements/RT__Queue/ColumnMap Fri Jul 11 03:34:49 2008
@@ -52,7 +52,7 @@
<%ONCE>
my $COLUMN_MAP = {
id => {
- title => loc('#'),
+ title => '#', # loc
attribute => 'id',
align => 'right',
value => sub { return $_[0]->id },
@@ -63,45 +63,45 @@
value => sub { return $_[0]->Disabled? $_[0]->loc('Disabled'): $_[0]->loc('Enabled') },
},
Priority => {
- title => loc('Priority'),
+ title => 'Priority', # loc
value => sub { return $_[0]->InitialPriority .'-'. $_[0]->FinalPriority },
},
Address => {
- title => loc('Address'),
+ title => 'Address', # loc
value => sub { return ($_[0]->CorrespondAddress||'-') .'/'. ($_[0]->CommentAddress||'-') },
},
Name => {
- title => loc('Name'),
+ title => 'Name', # loc
attribute => 'Name',
value => sub { return $_[0]->Name() },
},
Description => {
- title => loc('Description'),
+ title => 'Description', # loc
attribute => 'Description',
value => sub { return $_[0]->Description() },
},
CorrespondAddress => {
- title => loc('CorrespondAddress'),
+ title => 'CorrespondAddress', # loc
attribute => 'CorrespondAddress',
value => sub { return $_[0]->CorrespondAddress() },
},
CommentAddress => {
- title => loc('CommentAddress'),
+ title => 'CommentAddress', # loc
attribute => 'CommentAddress',
value => sub { return $_[0]->CommentAddress() },
},
InitialPriority => {
- title => loc('InitialPriority'),
+ title => 'InitialPriority', # loc
attribute => 'InitialPriority',
value => sub { return $_[0]->InitialPriority() },
},
FinalPriority => {
- title => loc('FinalPriority'),
+ title => 'FinalPriority', # loc
attribute => 'FinalPriority',
value => sub { return $_[0]->FinalPriority() },
},
DefaultDueIn => {
- title => loc('DefaultDueIn'),
+ title => 'DefaultDueIn', # loc
attribute => 'DefaultDueIn',
value => sub { return $_[0]->DefaultDueIn() },
},
Modified: rt/3.8/trunk/share/html/Elements/RT__Scrip/ColumnMap
==============================================================================
--- rt/3.8/trunk/share/html/Elements/RT__Scrip/ColumnMap (original)
+++ rt/3.8/trunk/share/html/Elements/RT__Scrip/ColumnMap Fri Jul 11 03:34:49 2008
@@ -52,32 +52,32 @@
<%ONCE>
my $COLUMN_MAP = {
id => {
- title => loc('#'),
+ title => '#', # loc
attribute => 'id',
align => 'right',
value => sub { return $_[0]->id },
},
Queue => {
- title => loc('Queue'),
+ title => 'Queue', # loc
value => sub {
return $_[0]->QueueObj->Name if $_[0]->Queue;
return $_[0]->loc('Global');
},
},
Condition => {
- title => loc('Condition'),
+ title => 'Condition', # loc
value => sub { return $_[0]->loc( $_[0]->ScripConditionObj->Name ) },
},
Action => {
- title => loc('Action'),
+ title => 'Action', # loc
value => sub { return $_[0]->loc( $_[0]->ScripActionObj->Name ) },
},
Template => {
- title => loc('Template'),
+ title => 'Template', # loc
value => sub { return $_[0]->loc( $_[0]->TemplateObj->Name ) },
},
AutoDescription => {
- title => loc('Condition, Action and Template'),
+ title => 'Condition, Action and Template', # loc
value => sub { return $_[0]->loc( "[_1] [_2] with template [_3]",
$_[0]->loc($_[0]->ConditionObj->Name),
$_[0]->loc($_[0]->ActionObj->Name),
@@ -85,12 +85,12 @@
) },
},
Description => {
- title => loc('Description'),
+ title => 'Description', # loc
attribute => 'Description',
value => sub { return $_[0]->Description() },
},
Stage => {
- title => loc('Stage'),
+ title => 'Stage', # loc
attribute => 'Stage',
value => sub { return $_[0]->Stage() },
},
Modified: rt/3.8/trunk/share/html/Elements/RT__Template/ColumnMap
==============================================================================
--- rt/3.8/trunk/share/html/Elements/RT__Template/ColumnMap (original)
+++ rt/3.8/trunk/share/html/Elements/RT__Template/ColumnMap Fri Jul 11 03:34:49 2008
@@ -52,18 +52,18 @@
<%ONCE>
my $COLUMN_MAP = {
id => {
- title => loc('#'),
+ title => '#', # loc
attribute => 'id',
align => 'right',
value => sub { return $_[0]->id },
},
Name => {
- title => loc('Name'),
+ title => 'Name', # loc
attribute => 'Name',
value => sub { return $_[0]->Name() },
},
Description => {
- title => loc('Description'),
+ title => 'Description', # loc
attribute => 'Description',
value => sub { return $_[0]->Description() },
},
Modified: rt/3.8/trunk/share/html/Elements/RT__Ticket/ColumnMap
==============================================================================
--- rt/3.8/trunk/share/html/Elements/RT__Ticket/ColumnMap (original)
+++ rt/3.8/trunk/share/html/Elements/RT__Ticket/ColumnMap Fri Jul 11 03:34:49 2008
@@ -77,31 +77,31 @@
$COLUMN_MAP = {
Queue => {
attribute => 'Queue',
- title => loc('Queue id'),
+ title => 'Queue id', # loc
value => sub { return $_[0]->Queue }
},
QueueName => {
attribute => 'Queue',
- title => loc('Queue'),
+ title => 'Queue', # loc
value => sub { return $_[0]->QueueObj->Name }
},
OwnerName => {
- title => loc('Owner'),
+ title => 'Owner', # loc
attribute => 'Owner',
value => sub { return $_[0]->OwnerObj->Name }
},
Status => {
- title => loc('Status'),
+ title => 'Status', # loc
attribute => 'Status',
value => sub { return loc($_[0]->Status) }
},
Subject => {
- title => loc('Subject'),
+ title => 'Subject', # loc
attribute => 'Subject',
value => sub { return $_[0]->Subject || "(" . loc('No subject') . ")" }
},
ExtendedStatus => {
- title => loc('Status'),
+ title => 'Status', # loc
attribute => 'Status',
value => sub {
my $Ticket = shift;
@@ -123,54 +123,54 @@
}
},
Priority => {
- title => loc('Priority'),
+ title => 'Priority', # loc
attribute => 'Priority',
value => sub { return $_[0]->Priority }
},
InitialPriority => {
- title => loc('InitialPriority'),
+ title => 'InitialPriority', # loc
attribute => 'InitialPriority',
name => 'Initial Priority',
value => sub { return $_[0]->InitialPriority }
},
FinalPriority => {
- title => loc('FinalPriority'),
+ title => 'FinalPriority', # loc
attribute => 'FinalPriority',
name => 'Final Priority',
value => sub { return $_[0]->FinalPriority }
},
EffectiveId => {
- title => loc('EffectiveId'),
+ title => 'EffectiveId', # loc
attribute => 'EffectiveId',
value => sub { return $_[0]->EffectiveId }
},
Type => {
- title => loc('Type'),
+ title => 'Type', # loc
attribute => 'Type',
value => sub { return $_[0]->Type }
},
TimeWorked => {
attribute => 'TimeWorked',
- title => loc('Time Worked'),
+ title => 'Time Worked', # loc
value => sub { return $_[0]->TimeWorked }
},
TimeLeft => {
attribute => 'TimeLeft',
- title => loc('Time Left'),
+ title => 'Time Left', # loc
value => sub { return $_[0]->TimeLeft }
},
TimeEstimated => {
attribute => 'TimeEstimated',
- title => loc('Time Estimated'),
+ title => 'Time Estimated', # loc
value => sub { return $_[0]->TimeEstimated }
},
Requestors => {
- title => loc('Requestors'),
+ title => 'Requestors', # loc
attribute => 'Requestor.EmailAddress',
value => sub { return $_[0]->Requestors->MemberEmailAddressesAsString }
},
Cc => {
- title => loc('Cc'),
+ title => 'Cc', # loc
attribute => 'Cc.EmailAddress',
value => sub { return $_[0]->Cc->MemberEmailAddressesAsString }
},
@@ -180,22 +180,22 @@
value => sub { return $_[0]->AdminCc->MemberEmailAddressesAsString }
},
StartsRelative => {
- title => loc('Starts'),
+ title => 'Starts', # loc
attribute => 'Starts',
value => sub { return $_[0]->StartsObj->AgeAsString }
},
StartedRelative => {
- title => loc('Started'),
+ title => 'Started', # loc
attribute => 'Started',
value => sub { return $_[0]->StartedObj->AgeAsString }
},
ToldRelative => {
- title => loc('Told'),
+ title => 'Told', # loc
attribute => 'Told',
value => sub { return $_[0]->ToldObj->AgeAsString }
},
DueRelative => {
- title => loc('Due'),
+ title => 'Due', # loc
attribute => 'Due',
value => sub {
my $date = $_[0]->DueObj;
@@ -208,37 +208,37 @@
}
},
ResolvedRelative => {
- title => loc('Resolved'),
+ title => 'Resolved', # loc
attribute => 'Resolved',
value => sub { return $_[0]->ResolvedObj->AgeAsString }
},
Starts => {
- title => loc('Starts'),
+ title => 'Starts', # loc
attribute => 'Starts',
value => sub { return $_[0]->StartsObj->AsString }
},
Started => {
- title => loc('Started'),
+ title => 'Started', # loc
attribute => 'Started',
value => sub { return $_[0]->StartedObj->AsString }
},
Told => {
- title => loc('Told'),
+ title => 'Told', # loc
attribute => 'Told',
value => sub { return $_[0]->ToldObj->AsString }
},
Due => {
- title => loc('Due'),
+ title => 'Due', # loc
attribute => 'Due',
value => sub { return $_[0]->DueObj->AsString }
},
Resolved => {
- title => loc('Resolved'),
+ title => 'Resolved', # loc
attribute => 'Resolved',
value => sub { return $_[0]->ResolvedObj->AsString }
},
UpdateStatus => {
- title => loc('New messages'),
+ title => 'New messages', # loc
value => sub {
my $txn = $_[0]->SeenUpTo or return $_[0]->loc('No');
return \('<a href="'. RT->Config->Get('WebPath') .'/Ticket/Display.html?id='
@@ -247,7 +247,7 @@
},
},
KeyRequestors => {
- title => loc('Requestors'),
+ title => 'Requestors', # loc
attribute => 'Requestor.EmailAddress',
value => sub {
my $t = shift;
@@ -266,7 +266,7 @@
}
},
KeyOwnerName => {
- title => loc('Owner'),
+ title => 'Owner', # loc
attribute => 'Owner',
value => sub {
my $t = shift;
@@ -293,7 +293,7 @@
},
'_CHECKBOX' => {
attribute => 'checkbox',
- title => loc('Update'),
+ title => 'Update', # loc
align => 'right',
value => sub { return \('<input type="checkbox" class="checkbox" name="UpdateTicket'.$_[0]->id.'" value="1" checked="checked" />') }
},
Modified: rt/3.8/trunk/share/html/Elements/RT__User/ColumnMap
==============================================================================
--- rt/3.8/trunk/share/html/Elements/RT__User/ColumnMap (original)
+++ rt/3.8/trunk/share/html/Elements/RT__User/ColumnMap Fri Jul 11 03:34:49 2008
@@ -52,83 +52,83 @@
<%ONCE>
my $COLUMN_MAP = {
id => {
- title => loc('#'),
+ title => '#', # loc
attribute => 'id',
align => 'right',
value => sub { return $_[0]->id },
},
Name => {
- title => loc('Name'),
+ title => 'Name', # loc
attribute => 'Name',
value => sub { return $_[0]->Name() },
},
RealName => {
- title => loc('RealName'),
+ title => 'RealName', # loc
attribute => 'RealName',
value => sub { return $_[0]->RealName() },
},
NickName => {
- title => loc('NickName'),
+ title => 'NickName', # loc
attribute => 'NickName',
value => sub { return $_[0]->NickName() },
},
EmailAddress => {
- title => loc('EmailAddress'),
+ title => 'EmailAddress', # loc
attribute => 'EmailAddress',
value => sub { return $_[0]->EmailAddress() },
},
Organization => {
- title => loc('Organization'),
+ title => 'Organization', # loc
attribute => 'Organization',
value => sub { return $_[0]->Organization() },
},
HomePhone => {
- title => loc('HomePhone'),
+ title => 'HomePhone', # loc
attribute => 'HomePhone',
value => sub { return $_[0]->HomePhone() },
},
WorkPhone => {
- title => loc('WorkPhone'),
+ title => 'WorkPhone', # loc
attribute => 'WorkPhone',
value => sub { return $_[0]->WorkPhone() },
},
MobilePhone => {
- title => loc('MobilePhone'),
+ title => 'MobilePhone', # loc
attribute => 'MobilePhone',
value => sub { return $_[0]->MobilePhone() },
},
PagerPhone => {
- title => loc('PagerPhone'),
+ title => 'PagerPhone', # loc
attribute => 'PagerPhone',
value => sub { return $_[0]->PagerPhone() },
},
Address1 => {
- title => loc('Address1'),
+ title => 'Address1', # loc
attribute => 'Address1',
value => sub { return $_[0]->Address1() },
},
Address2 => {
- title => loc('Address2'),
+ title => 'Address2', # loc
attribute => 'Address2',
value => sub { return $_[0]->Address2() },
},
City => {
- title => loc('City'),
+ title => 'City', # loc
attribute => 'City',
value => sub { return $_[0]->City() },
},
State => {
- title => loc('State'),
+ title => 'State', # loc
attribute => 'State',
value => sub { return $_[0]->State() },
},
Zip => {
- title => loc('Zip'),
+ title => 'Zip', # loc
attribute => 'Zip',
value => sub { return $_[0]->Zip() },
},
Country => {
- title => loc('Country'),
+ title => 'Country', # loc
attribute => 'Country',
value => sub { return $_[0]->Country() },
},
More information about the Rt-commit
mailing list