Add expired as a reason for post and sub denial.

[mlmmj-listtexts.git] / en / deny

diff --git a/en/deny b/en/deny
index 5c1804bc6e2d1a077a20bce7e14a4e5e7576911f..2e1dd9aa7eb8b6c8dea3acfad161c5d74b635804 100644 (file)
--- a/en/deny
+++ b/en/deny
@@ -1,12 +1,12 @@
-%ifaction sub%Subject: Unable to subscribe to $listaddr$%endif%
-%ifaction unsub%Subject: Unable to unsubscribe from $listaddr$%endif%
-%ifaction release reject%Subject: Unable to moderate $listaddr$%endif%
-%ifaction permit obstruct%Subject: Unable to gatekeep $listaddr$%endif%
+%ifaction sub%Subject: Unable to subscribe to $list$@$domain$%endif%
+%ifaction unsub%Subject: Unable to unsubscribe from $list$@$domain$%endif%
+%ifaction release reject%Subject: Unable to moderate $list$@$domain$%endif%
+%ifaction permit obstruct%Subject: Unable to gatekeep $list$@$domain$%endif%
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
-%wrap%
 %ifaction sub%
+%wrap%
   You were unable to be subscribed to the list
   %ifreason disabled%
     because
@@ -21,11 +21,16 @@
   %ifreason subbed%
     because you are already subscribed.
   %endif%
+  %ifreason expired%
+    because too much time passed without a gatekeeper permitting your entry.
+  %endif%
   %ifreason obstruct%
     because a gatekeeper obstructed your entry.
   %endif%
 %endif%
+
 %ifaction unsub%
+%wrap%
   You were unable to be unsubscribed from
   %iftype normal%%endif%
   %iftype digest% the digest version of %endif%
@@ -42,16 +47,18 @@
     %iftype digest%
       Or perhaps you are subscribed to the normal version of the list. To
       unsubscribe from that version of the list, send a message to
-      $listunsubaddr$
+      $list+$unsubscribe@$domain$
     %endif
     %iftype normal%
       Or perhaps you are subscribed to the digest version of the list. To
       unsubscribe from that version of the list, send a message to
-      $digestunsubaddr$
+      $list+$unsubscribe-digest@$domain$
     %endif
   %endif%
 %endif%
+
 %ifaction release reject%
+%wrap%
   %ifaction release%
     You were unable to release the specified post to the list
   %endif%
@@ -66,7 +73,9 @@
     because you are not a moderator for the list.
   %endif%
 %endif%
+
 %ifaction permit obstruct%
+%wrap%
   %ifaction permit%
     You were unable to permit the specified subscription request
   %endif%