Index: openacs-4/packages/bulk-mail/catalog/bulk-mail.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/catalog/bulk-mail.en_US.ISO-8859-1.xml,v
diff -u -r1.9 -r1.9.4.1
--- openacs-4/packages/bulk-mail/catalog/bulk-mail.en_US.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.9
+++ openacs-4/packages/bulk-mail/catalog/bulk-mail.en_US.ISO-8859-1.xml	22 Jun 2004 14:06:57 -0000	1.9.4.1
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="bulk-mail" package_version="0.5" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="Cancelled">Cancelled</msg>
   <msg key="Extra_Headers">Extra Headers</msg>
   <msg key="From">From</msg>
   <msg key="lt_No_bulk_mail_messages">No bulk mail messages to display.</msg>
   <msg key="Message">Message</msg>
+  <msg key="Message_not_sent_yet">This message has not been sent yet.  You may &lt;a href=&quot;cancel?bulk_mail_id=%bulk_mail_id%&quot;&gt;cancel&lt;/a&gt; it.</msg>
   <msg key="No">No</msg>
+  <msg key="Pending">Pending</msg>
   <msg key="pretty_name">Bulk Mail</msg>
   <msg key="Query">Query</msg>
   <msg key="Reply_To">Reply To</msg>
   <msg key="Send_Date">Send Date</msg>
-  <msg key="Sent">Sent?</msg>
+  <msg key="Sent">Sent</msg>
+  <msg key="Status">Status</msg>
   <msg key="Subject">Subject</msg>
   <msg key="Yes">Yes</msg>
 </message_catalog>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/bulk-mail/www/cancel.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/bulk-mail/www/cancel.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/bulk-mail/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/index.tcl,v
diff -u -r1.11 -r1.11.4.1
--- openacs-4/packages/bulk-mail/www/index.tcl	22 Oct 2003 15:01:47 -0000	1.11
+++ openacs-4/packages/bulk-mail/www/index.tcl	22 Jun 2004 14:06:57 -0000	1.11.4.1
@@ -22,7 +22,7 @@
                    [list send_date [_ bulk-mail.Send_Date] {bulk_mail_messages.send_date $order} {<td width="10%">[lc_time_fmt $send_date "%q"]</td>}] \
                    [list from_addr [_ bulk-mail.From] {bulk_mail_messages.from_addr $order} {<td width="15%">$from_addr</td>}] \
                    [list subject [_ bulk-mail.Subject] {bulk_mail_messages.subject $order} {<td><a href="[lindex [site_node::get_url_from_object_id -object_id $package_id] 0]one?bulk_mail_id=$bulk_mail_id">$subject</a></td>}] \
-                   [list status [_ bulk-mail.Sent] {bulk_mail_messages.status $order} {<td width="10%" align="center">[ad_decode $status sent [_ bulk-mail.Yes] [_ bulk-mail.No]]</td>}] \
+                   [list status [_ bulk-mail.Status] {bulk_mail_messages.status $order} {<td width="10%" align="center">[ad_decode $status sent [_ bulk-mail.Sent] pending [_ bulk-mail.Pending] [_ bulk-mail.Cancelled]]</td>}] \
                   ]
 
 set sql "
Index: openacs-4/packages/bulk-mail/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/one.adp,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/bulk-mail/www/one.adp	13 Nov 2003 22:20:39 -0000	1.10
+++ openacs-4/packages/bulk-mail/www/one.adp	22 Jun 2004 14:06:57 -0000	1.10.2.1
@@ -2,6 +2,9 @@
 <property name="title">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
+<if @status@ eq "pending">
+#bulk-mail.Message_not_sent_yet#
+</if>
   <table bgcolor="#ececec" border="1" width="95%" cellpadding="3" cellspacing="3">
     <tr>
       <td>#bulk-mail.Send_Date#</td>
@@ -32,8 +35,8 @@
       <td><if @query@ not nil><pre>@query@</pre></if><else>&nbsp;</else></td>
     </tr>
     <tr>
-      <td>#bulk-mail.Sent#</td>
-      <td><if @status@ eq sent>#bulk-mail.Yes#</if><else>#bulk-mail.No#</else></td>
+      <td>#bulk-mail.Status#</td>
+      <td><if @status@ eq sent>#bulk-mail.Sent#</if><elseif @status@ eq pending>#bulk-mail.Pending#</elseif><else>#bulk-mail.Cancelled#</else></td>
     </tr>
   </table>