From: Ben Schmidt Date: Mon, 21 Feb 2011 23:40:00 +0000 (+1100) Subject: Move prologue into its own file, and update deprecated stuff. X-Git-Url: http://www.git.stargrave.org/?p=mlmmj-listtexts.git;a=commitdiff_plain;h=251cc1978fab49d2cd5be6f4ccc1a48b94b4047e Move prologue into its own file, and update deprecated stuff. --- diff --git a/en/confirm b/en/confirm index e729ec3..32dfdfd 100644 --- a/en/confirm +++ b/en/confirm @@ -1,7 +1,7 @@ -%ifaction sub%Subject: Confirm subscription to $listaddr$%endif% -%ifaction unsub%Subject: Confirm unsubscribe from $listaddr$%endif% +%ifaction sub%Subject: Confirm subscription to $list$@$domain$%endif% +%ifaction unsub%Subject: Confirm unsubscribe from $list$@$domain$%endif% -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% %wrap% %ifaction sub% diff --git a/en/deny b/en/deny index 5c1804b..0013d93 100644 --- a/en/deny +++ b/en/deny @@ -1,9 +1,9 @@ -%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% @@ -42,12 +42,12 @@ %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% diff --git a/en/deny-post b/en/deny-post index 6e8b21e..d949c2b 100644 --- a/en/deny-post +++ b/en/deny-post @@ -1,4 +1,4 @@ -Subject: Post to $listaddr$ denied: $subject$ +Subject: Post to $list$@$domain$ denied: $subject$ MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_$random0$$random1$_=" @@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% %wrap%The message from $posteraddr$ with subject "$subject" was unable to be delivered to the list @@ -55,7 +55,8 @@ to be delivered to the list %endif%%endif% %ifcontrol closedlist closedlistsub% If you wish to become a subscriber, you will need to contact a list - administrator. You can email $listowner$ to contact the list owner. + administrator. You can email $list+$owner@$domain$ to contact the list + owner. %endif% %wrap% diff --git a/en/digest b/en/digest index 64d14f3..e9fa859 100644 --- a/en/digest +++ b/en/digest @@ -1,4 +1,4 @@ -Subject: Digest of $listaddr$ issue $digestissue$ ($digestinterval$) +Subject: Digest of $list$@$domain$ issue $digestissue$ ($digestinterval$) Topics (messages $digestfirst$ through $digestlast$): - %digestthreads% diff --git a/en/faq b/en/faq index 154c0f5..28f22fe 100644 --- a/en/faq +++ b/en/faq @@ -1,4 +1,4 @@ -Subject: Frequently asked questions of $listaddr$ +Subject: Frequently asked questions of $list$@$domain$ Sorry, no FAQ available yet. diff --git a/en/finish b/en/finish index f9c14dc..05e2c70 100644 --- a/en/finish +++ b/en/finish @@ -1,9 +1,9 @@ -%ifaction unsub%Subject: Goodbye from $listaddr$%endif% -%ifaction release reject%Subject: Moderated $listaddr$: $subject$%endif% -%ifaction permit obstruct%Subject: Guarded $listaddr$: $subaddr$%endif% -%ifaction post%Subject: Posted to $listaddr$: $subject$%endif% +%ifaction unsub%Subject: Goodbye from $list$@$domain$%endif% +%ifaction release reject%Subject: Moderated $list$@$domain$: $subject$%endif% +%ifaction permit obstruct%Subject: Guarded $list$@$domain$: $subaddr$%endif% +%ifaction post%Subject: Posted to $list$@$domain$: $subject$%endif% -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% %wrap% %ifaction unsub% diff --git a/en/finish-sub b/en/finish-sub index f4aa798..a3eb891 100644 --- a/en/finish-sub +++ b/en/finish-sub @@ -1,6 +1,6 @@ -Subject: Welcome to $listaddr$ +Subject: Welcome to $list$@$domain$ -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% %wrap% %ifreason request% @@ -23,16 +23,17 @@ The email address you are subscribed with is $reqaddr$. %wrap% %ifcontrol closedlist% If you ever wish to unsubscribe, you will need to contact a list - administrator. You can email $listowner$ to contact the list owner. + administrator. You can email $list+$owner@$domain$ to contact the list + owner. %else% If you ever wish to unsubscribe, send a message to - %iftype normal%$listunsubaddr$%endif% - %iftype digest%$digestunsubaddr$%endif% - %iftype nomail%$nomailunsubaddr$%endif% + %iftype normal%$list+$unsubscribe@$domain$%endif% + %iftype digest%$list+$unsubscribe-digest@$domain$%endif% + %iftype nomail%$list+$unsubscribe-nomail@$domain$%endif% using this email address. The subject and the body of the message can be anything. You will then receive confirmation or further instructions. %endif% %wrap%For other information and help about this list, send a message to -$helpaddr$ +$list+$help@$domain$ diff --git a/en/gatekeep-sub b/en/gatekeep-sub index 467d5f0..3e708c2 100644 --- a/en/gatekeep-sub +++ b/en/gatekeep-sub @@ -1,6 +1,6 @@ -Subject: Subscription request for $listaddr$: $subaddr$ +Subject: Subscription request for $list$@$domain$: $subaddr$ -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% %wrap%There has been a request from $subaddr$ to join %iftype normal%%endif% diff --git a/en/help b/en/help index e068e48..fa7a617 100644 --- a/en/help +++ b/en/help @@ -1,6 +1,6 @@ -Subject: Information for $listaddr$ +Subject: Information for $list$@$domain$ -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% Here is some information about the list. @@ -11,12 +11,12 @@ It has the following versions: %ifcontrol closedlist closedlistsub% - Subscribe by contacting a list administrator. %else% - - %wrap%Subscribe by emailing: $listsubaddr$ + - %wrap%Subscribe by emailing: $list+$subscribe@$domain$ %endif% %ifcontrol closedlist% - Unsubscribe by contacting a list administrator. %else% - - %wrap%Unsubscribe by emailing: $listunsubaddr$ + - %wrap%Unsubscribe by emailing: $list+$unsubscribe@$domain$ %endif% %ifncontrol nodigestsub% @@ -25,12 +25,12 @@ It has the following versions: %ifcontrol closedlist closedlistsub% - Subscribe by contacting a list administrator. %else% - - %wrap%Subscribe by emailing: $digestsubaddr$ + - %wrap%Subscribe by emailing: $list+$subscribe-digest@$domain$ %endif% %ifcontrol closedlist% - Unsubscribe by contacting a list administrator. %else% - - %wrap%Unsubscribe by emailing: $digestunsubaddr$ + - %wrap%Unsubscribe by emailing: $list+$unsubscribe-digest@$domain$ %endif% %endif% @@ -42,12 +42,12 @@ It has the following versions: %ifcontrol closedlist closedlistsub% - Subscribe by contacting a list administrator. %else% - - %wrap%Subscribe by emailing: $nomailsubaddr$ + - %wrap%Subscribe by emailing: $list+$subscribe-nomail@$domain$ %endif% %ifcontrol closedlist% - Unsubscribe by contacting a list administrator. %else% - - %wrap%Unsubscribe by emailing: $nomailunsubaddr$ + - %wrap%Unsubscribe by emailing: $list+$unsubscribe-nomail@$domain$ %endif% %endif% @@ -56,7 +56,7 @@ The list has gatekeepers who will review subscription requests before permitting new members. %endif% -Posts are made by emailing $listaddr$ +Posts are made by emailing $list$@$domain$ %ifcontrol subonlypost%%ifncontrol modnonsubposts% However, only subscribers may post to the list. @@ -86,8 +86,13 @@ Anyone Subscribers %endif% can retrieve message number N from the list's archive by sending a message -to $listgetN$ (and changing the N to the number of the desired message). +to $list+$get-N@$domain$ (change the N to the number of the desired message). %endif%%endif% -To contact the list owner, send a message to $listowner$ +%wrap% +You can retrieve the frequently asked questions document for the list by +sending a message to $list+$faq@$domain$ + +%wrap% +To contact the list owner, send a message to $list+$owner@$domain$ diff --git a/en/list b/en/list index 82ec4a3..f95b687 100644 --- a/en/list +++ b/en/list @@ -1,6 +1,6 @@ -Subject: Subscribers to $listaddr$ +Subject: Subscribers to $list$@$domain$ -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% %wrap%Here is the list of subscribers %iftype all% diff --git a/en/moderate-post b/en/moderate-post index 1dc296f..ffb44a7 100644 --- a/en/moderate-post +++ b/en/moderate-post @@ -1,4 +1,4 @@ -Subject: Please moderate $listaddr$: $subject$ +Subject: Please moderate $list$@$domain$: $subject$ MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_$random0$$random1$_=" @@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% %wrap%A message from $posteraddr$ with subject "$subject$" has been submitted for posting. You are being asked to moderate diff --git a/en/notify b/en/notify index ac55ef0..e2e3270 100644 --- a/en/notify +++ b/en/notify @@ -1,7 +1,7 @@ -%ifaction sub%Subject: Subscribed to $listaddr$: $subaddr$%endif% -%ifaction unsub%Subject: Unsubscribed from $listaddr$: $subaddr$%endif% +%ifaction sub%Subject: Subscribed to $list$@$domain$: $subaddr$%endif% +%ifaction unsub%Subject: Unsubscribed from $list$@$domain$: $subaddr$%endif% -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% %wrap% %ifaction sub% diff --git a/en/probe b/en/probe index 48cd3f4..397ebbe 100644 --- a/en/probe +++ b/en/probe @@ -1,6 +1,6 @@ -Subject: Bouncing messages from $listaddr$ +Subject: Bouncing messages from $list$@$domain$ -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% Some messages to you could not be delivered. If you're seeing this message it means things are back to normal, and it's merely for your diff --git a/en/prologue b/en/prologue new file mode 100644 index 0000000..10b5e87 --- /dev/null +++ b/en/prologue @@ -0,0 +1,2 @@ +%wrap%Hi, this is the Mlmmj program managing the $list$@$domain$ mailing +list. diff --git a/en/wait-post b/en/wait-post index 3a9964e..e9ca37a 100644 --- a/en/wait-post +++ b/en/wait-post @@ -1,4 +1,4 @@ -Subject: Awaiting release to $listaddr$: $subject$ +Subject: Awaiting release to $list$@$domain$: $subject$ MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_$random0$$random1$_=" @@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% %wrap%The message from $posteraddr$ with subject "$subject$" has been submitted to the list. However, the moderators are being asked to review it diff --git a/en/wait-sub b/en/wait-sub index e9f889e..84df549 100644 --- a/en/wait-sub +++ b/en/wait-sub @@ -1,6 +1,6 @@ -Subject: Awaiting permission to join $listaddr$ +Subject: Awaiting permission to join $list$@$domain$ -%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list. +%text prologue% %wrap%Your request to join the list has been received. However, the gatekeepers are being asked to review it before permitting you to join.