Richer MIME list texts with inline messages (English only so far)

diff --git a/ChangeLog b/ChangeLog
index 7d10da186b553697a1000baefb044e9594d43991..08041ce61a37af5f43f4c036118e41d02ea27773 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+ o Richer MIME list texts with inline messages (English only so far)
  o Add $random0$ through $random5$ substitutions
  o Add a $subject$ substitution for list texts
  o Changes to how $originalmail$ works -- existing installations will change

diff --git a/listtexts/en/access b/listtexts/en/access
index 90c1989a4f9a058db80e1c111ca53eb68c617e05..3ca380c7b17465dc7654057b6b35d357ab2eb4c9 100644 (file)
--- a/listtexts/en/access
+++ b/listtexts/en/access
@@ -1,14 +1,32 @@
 Subject: Post to $listaddr$ denied
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-I'm sorry to inform you that your message could not be delivered to the
-list. Your mail was rejected because it matched a rule set up by the
-list administrator.
+I'm sorry to inform you that your message with subject line
+
+$subject$
+
+could not be delivered to the list. Your mail was rejected because it
+matched a rule set up by the list administrator.
 
 Thanks.
 
---- Below this line are the first 100 lines of the denied message --->
- $originalmail$
+(The denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--

diff --git a/listtexts/en/maxmailsize b/listtexts/en/maxmailsize
index 3925f1b085ea70491988c4db8da5c7d9337cf7c7..ee78adbc4778a39393b26bf5ae72fa91d2777814 100644 (file)
--- a/listtexts/en/maxmailsize
+++ b/listtexts/en/maxmailsize
@@ -1,4 +1,12 @@
 Subject: Post to $listaddr$ denied due to size limit
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
@@ -9,5 +17,12 @@ list. Your mail was rejected due to the size limit of $maxmailsize$ bytes.
 
 Thanks.
 
---- Below this line are the first 100 lines of the denied message --->
- $originalmail$
+(The beginning of the denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail$
+--=_$random0$$random1$_=--

diff --git a/listtexts/en/moderation b/listtexts/en/moderation
index 7a7d9df6e81e8d44bc98f3eac6be6abe844a580f..c7d658c51e941724717a056ba8684c31341f1c26 100644 (file)
--- a/listtexts/en/moderation
+++ b/listtexts/en/moderation
@@ -1,4 +1,12 @@
 Subject: Moderation needed for $listaddr$
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hello,
 
@@ -6,6 +14,12 @@ Someone has submitted a message for moderation to:
 
 $listaddr$
 
+with subject line:
+
+$subject$
+
+It is below.
+
 To accept it send a message to:
 
 $moderateaddr$
@@ -18,5 +32,10 @@ The following moderators have received this mail:
 
 $moderators$
 
---- Below this line are the first 100 lines of the message up for moderation --->
- $originalmail$
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--

diff --git a/listtexts/en/moderation-poster b/listtexts/en/moderation-poster
index a4a9fe4702e9daa33418bbc4912f06c4ca049568..8583388f65050d7c650362f2e2c8576689889a8f 100644 (file)
--- a/listtexts/en/moderation-poster
+++ b/listtexts/en/moderation-poster
@@ -1,11 +1,30 @@
 Subject: Post waiting for approval
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-This list is configured to have moderated posts, the post has been queued
-for approval.
+This list is configured to have moderated posts. Your post with subject
+line
+
+$subject$
+
+has been queued for approval.
+
+(The queued message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
 
---- Below this line are the first 100 lines of the message up for moderation --->
- $originalmail$
+$originalmail1000000000$
+--=_$random0$$random1$_=--

diff --git a/listtexts/en/notintocc b/listtexts/en/notintocc
index 841168e91985c458b908a26bbdb4c2a0c73c8fa6..8c2f052fe6c53ee4bb88cc26f9ec66ffc84b1c04 100644 (file)
--- a/listtexts/en/notintocc
+++ b/listtexts/en/notintocc
@@ -1,16 +1,34 @@
 Subject: Posts to $listaddr$ denied
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-I'm sorry to inform you that your message could not be delivered to the
-list.
+I'm sorry to inform you that your message with subject line
+
+$subject$
+
+could not be delivered to the list.
 
 In order to post to this list, the list address must be contained
 in either the To: or Cc: header.
 
 Thanks.
 
---- Below this line are the first 100 lines of the denied message --->
- $originalmail$
+(The denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--

diff --git a/listtexts/en/subonlypost b/listtexts/en/subonlypost
index 8dc146d35c8665675d69ba48965822d3ea50c0cd..f647a9346dc287a7e0a21f4f3c3eac26e1e695b3 100644 (file)
--- a/listtexts/en/subonlypost
+++ b/listtexts/en/subonlypost
@@ -1,14 +1,26 @@
 Subject: $listaddr$ is a subscribers only list
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-You have tried to post from this email address:
+Your post with subject line
+
+$subject$
+
+came from the email address
 
 $posteraddr$
 
-But this address is not subscribed, and only subscribers may post to
+but this address is not subscribed, and only subscribers may post to
 the list.
 
 If you believe you are correctly subscribed, please check the email address
@@ -18,5 +30,12 @@ any message to the mailinglist.
 If you want to be able to post from more than one email address, you
 can subscribe the other addresses to the nomail version of the list.
 
---- Below this line are the first 100 lines of the denied message --->
- $originalmail$
+(The denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--