[Rt-commit] r11239 - in rt/branches/3.6-EXPERIMENTAL-ABERDEEN: . sbin

[jesse at bestpractical.com]

Author: jesse
Date: Thu Mar 27 12:05:15 2008
New Revision: 11239

Modified:
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/   (props changed)
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Ticket/Elements/ShowTransaction
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/sbin/extract-message-catalog

Log:
 r28248 at 31b (orig r11042):  clkao | 2008-03-11 15:01:00 -0400
 provide a ModifyCommand callback from ShowTransaction.
 
 r28449 at 31b (orig r11127):  jesse | 2008-03-19 12:37:11 -0400
  r28448 at 104:  jesse | 2008-03-19 12:37:01 -0400
  RT-Ticket: 9066
  RT-Status: resolved
  RT-Update: correspond
  
  * applied a patch from elacour to deal with multiline translation strings
 


Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Ticket/Elements/ShowTransaction	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Ticket/Elements/ShowTransaction	Thu Mar 27 12:05:15 2008
@@ -46,6 +46,8 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <div class="ticket-transaction<% $type_class && " $type_class" %><% $RowNum % 2 ? ' odd' : ' even' %>">
+% $m->comp('/Elements/Callback', _CallbackName => 'ModifyDisplay', titlebar_cmd => \$titlebar_commands, Transaction => $Transaction, %ARGS);
+
 <table width="100%" cellspacing="0" cellpadding="2" border="0">
   <tr>
     <td rowspan="2" valign="top" class="type">
@@ -70,6 +72,7 @@
 % $m->comp('ShowTransactionAttachments', %ARGS, Parent => 0) unless ($Collapsed ||!$ShowBody);
     </td>
   </tr>
+
 </table>
 </div>
 

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/sbin/extract-message-catalog
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/sbin/extract-message-catalog	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/sbin/extract-message-catalog	Thu Mar 27 12:05:15 2008
@@ -198,7 +198,8 @@
         my $msghdr = "";
         $msghdr .= shift @lines while ( $lines[0] && $lines[0] !~ /^msgid/ );
         
-        my $msgid  = shift @lines;
+        my $msgid  = "";
+        $msgid .= shift @lines while ( $lines[0] && $lines[0] =~ /^(msgid|")/ );
         my $msgstr = "";
         $msgstr .= shift @lines while ( $lines[0] && $lines[0] =~ /^(msgstr|")/ );