[Rt-commit] r2465 - in rt/branches/QUEBEC-EXPERIMENTAL: etc html/Elements

[clkao at bestpractical.com]

Author: clkao
Date: Mon Mar 14 11:35:59 2005
New Revision: 2465

Modified:
   rt/branches/QUEBEC-EXPERIMENTAL/etc/initialdata
   rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/ShowSearch
Log:
Localise format in predefined search with __l{text}__.

Modified: rt/branches/QUEBEC-EXPERIMENTAL/etc/initialdata
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/etc/initialdata	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/etc/initialdata	Mon Mar 14 11:35:59 2005
@@ -600,9 +600,8 @@
     { Name => 'Search - My Requests',
       Description => '[_1] newest unowned tickets', # loc
       Content     =>
-# take care of the loc here for 'Take'
-      { Format => "'<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__id__</a>/TITLE:#', '<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__Subject__</a>/TITLE:Subject', QueueName, ExtendedStatus, CreatedRelative, '<A HREF=\"__WebPath__/Ticket/Display.html?Action=Take&id=__id__\">Take</a>/TITLE:&nbsp;' ",
-
+# 'Take' #loc
+      { Format => "'<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__id__</a>/TITLE:#', '<a href=\"__WebPath__/Ticket/Display.html?id=__id__\">__Subject__</a>/TITLE:Subject', QueueName, ExtendedStatus, CreatedRelative, '<A HREF=\"__WebPath__/Ticket/Display.html?Action=Take&id=__id__\">__l{Take}__</a>/TITLE:&nbsp;' ",
         Query   => " Owner = 'Nobody' AND ( Status = 'new' OR Status = 'open')",
         OrderBy => 'Created',
         Order   => 'DESC' },

Modified: rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/ShowSearch
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/ShowSearch	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/html/Elements/ShowSearch	Mon Mar 14 11:35:59 2005
@@ -83,6 +83,7 @@
 my $rows = $user->Preferences('SummaryRows', $RT::DefaultSummaryRows);
 $SearchArg->{'Query'} =~ s/__CurrentUser__/$session{'CurrentUser'}->Id/ge;
 $SearchArg->{'Format'} =~ s/__WebPath__/$RT::WebPath/g;
+$SearchArg->{'Format'} =~ s/__l\{(\w+)\}__/loc("$1")/ge;
 my $QueryString = '?' . $m->comp('/Elements/QueryString',
 	    map { $_ => $SearchArg->{$_} } qw(Query Order OrderBy));