[Rt-commit] r15511 - in rt/3.8/trunk/share/html: Elements Search/Elements

[clkao at bestpractical.com]

Author: clkao
Date: Wed Aug 27 03:50:37 2008
New Revision: 15511

Modified:
   rt/3.8/trunk/share/html/Elements/SelectTicketTypes
   rt/3.8/trunk/share/html/Elements/ShowSearch
   rt/3.8/trunk/share/html/Search/Elements/DisplayOptions
   rt/3.8/trunk/share/html/Search/Elements/SelectLinks
   rt/3.8/trunk/share/html/Ticket/Elements/ShowBasics

Log:
use loc rather than |l for simple variables to avoid
extract-message-catalog capturing them.


Modified: rt/3.8/trunk/share/html/Elements/SelectTicketTypes
==============================================================================
--- rt/3.8/trunk/share/html/Elements/SelectTicketTypes	(original)
+++ rt/3.8/trunk/share/html/Elements/SelectTicketTypes	Wed Aug 27 03:50:37 2008
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 %foreach (@Types) {
-<option value="<% $_ %>"<% ($_ eq $Default) && qq[ selected="selected"] |n %>><&|/l&><% $_ %></&>
+<option value="<% $_ %>"<% ($_ eq $Default) && qq[ selected="selected"] |n %>><% loc($_) %>
 %}
 </select>
 

Modified: rt/3.8/trunk/share/html/Elements/ShowSearch
==============================================================================
--- rt/3.8/trunk/share/html/Elements/ShowSearch	(original)
+++ rt/3.8/trunk/share/html/Elements/ShowSearch	Wed Aug 27 03:50:37 2008
@@ -117,7 +117,8 @@
 
 foreach ( $SearchArg, $ProcessedSearchArg ) {
     $_->{'Format'} =~ s/__(Web(?:Path|Base|BaseURL))__/scalar RT->Config->Get($1)/ge;
-    $_->{'Format'} =~ s/__loc\(["']?(\w+)["']?\)__/loc("$1")/ge;
+    # extract-message-catalog would "$1", so we avoid quotes for loc calls
+    $_->{'Format'} =~ s/__loc\(["']?(\w+)["']?\)__/my $f = "$1"; loc($f)/ge;
     if ( $_->{'Query'} =~ /__Bookmarked__/ ) {
         $_->{'Rows'} = 999;
     }

Modified: rt/3.8/trunk/share/html/Search/Elements/DisplayOptions
==============================================================================
--- rt/3.8/trunk/share/html/Search/Elements/DisplayOptions	(original)
+++ rt/3.8/trunk/share/html/Search/Elements/DisplayOptions	Wed Aug 27 03:50:37 2008
@@ -67,7 +67,7 @@
 % if (defined $OrderBy[$o] and $field eq $OrderBy[$o]) {
 selected="selected"
 % }
-><&|/l&><%$field%></&></option>
+><% loc($field) %></option>
 % }
 </select>
 <select name="Order">

Modified: rt/3.8/trunk/share/html/Search/Elements/SelectLinks
==============================================================================
--- rt/3.8/trunk/share/html/Search/Elements/SelectLinks	(original)
+++ rt/3.8/trunk/share/html/Search/Elements/SelectLinks	Wed Aug 27 03:50:37 2008
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 % foreach (@fields) {
-<option value="<%$_%>"><&|/l&><%$_%></&></option>
+<option value="<%$_%>"><% loc($_) %></option>
 % }
 </select>
 <%ARGS>

Modified: rt/3.8/trunk/share/html/Ticket/Elements/ShowBasics
==============================================================================
--- rt/3.8/trunk/share/html/Ticket/Elements/ShowBasics	(original)
+++ rt/3.8/trunk/share/html/Ticket/Elements/ShowBasics	Wed Aug 27 03:50:37 2008
@@ -52,7 +52,7 @@
   </tr>
   <tr>
     <td class="label status"><&|/l&>Status</&>:</td>
-    <td class="value status"><&|/l&><% $Ticket->Status%></&></td>
+    <td class="value status"><% loc($Ticket->Status) %></td>
   </tr>
 % if ($Ticket->TimeEstimated) {
   <tr>