Mercurial > hg > listtexts

changeset 2:4f023aa1879c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changes to make text structure clearer (changed conditional algorithm).
author Ben Schmidt
date Fri, 04 Mar 2011 15:24:50 +1100
parents 4d51ba4753ae
children 4916b099368d
files en/confirm en/deny en/deny-post en/finish en/finish-sub en/help en/list en/moderate-post en/notify en/wait-post
diffstat 10 files changed, 46 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/en/confirm	Tue Feb 22 10:40:00 2011 +1100
+++ b/en/confirm	Fri Mar 04 15:24:50 2011 +1100
@@ -3,8 +3,8 @@
 
 %text prologue%
 
+%ifaction sub%
 %wrap%
-%ifaction sub%
   Somebody (and we hope it was you) has requested that your email address
   $subaddr$ be added
   %iftype normal%
@@ -24,7 +24,9 @@
     email address.
   %endif%
 %endif%
+
 %ifaction unsub%
+%wrap%
   Somebody (and we hope it was you) has requested that the email address
   $subaddr$ be removed from
   %iftype normal%%endif%
--- a/en/deny	Tue Feb 22 10:40:00 2011 +1100
+++ b/en/deny	Fri Mar 04 15:24:50 2011 +1100
@@ -5,8 +5,8 @@
 
 %text prologue%
 
+%ifaction sub%
 %wrap%
-%ifaction sub%
   You were unable to be subscribed to the list
   %ifreason disabled%
     because
@@ -25,7 +25,9 @@
     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%
@@ -51,7 +53,9 @@
     %endif
   %endif%
 %endif%
+
 %ifaction release reject%
+%wrap%
   %ifaction release%
     You were unable to release the specified post to the list
   %endif%
@@ -66,7 +70,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%
--- a/en/deny-post	Tue Feb 22 10:40:00 2011 +1100
+++ b/en/deny-post	Fri Mar 04 15:24:50 2011 +1100
@@ -28,22 +28,22 @@
 %ifreason subonlypost%
   because you are not a list subscriber.
 
+  %ifncontrol closedlist%%ifncontrol closedlistsub%
 %wrap%
-  %ifncontrol closedlist%%ifncontrol closedlistsub%
     However, this is an open list. If you wish, you can simultaneously
     subscribe and release your post by sending a message to
     $listsubreleaseaddr$ which can usually be done simply by replying to
     this message. The subject and the body of the message can be anything.
+
     %ifncontrol nodigestsub%
-
 %wrap%
       Or you can simultaneously subscribe to the digest version of the list
       and release your post by sending a message to $nomailsubreleaseaddr$
       and you will receive multiple posts in a single message, at regular
       intervals, or when a lot of posts have accumulated.
     %endif%
+
     %ifncontrol nonomailsub%
-
 %wrap%
       Or you can simultaneously subscribe to the no-mail version of the list
       and release your post by sending a message to $nomailsubreleaseaddr$
@@ -53,7 +53,9 @@
       to another version of the list.
     %endif%
   %endif%%endif%
+
   %ifcontrol closedlist closedlistsub%
+%wrap%
     If you wish to become a subscriber, you will need to contact a list
     administrator. You can email $list+$owner@$domain$ to contact the list
     owner.
--- a/en/finish	Tue Feb 22 10:40:00 2011 +1100
+++ b/en/finish	Fri Mar 04 15:24:50 2011 +1100
@@ -5,8 +5,8 @@
 
 %text prologue%
 
+%ifaction unsub%
 %wrap%
-%ifaction unsub%
   %ifreason request%
   %endif%
   %ifreason confirm%
@@ -18,21 +18,31 @@
   %iftype nomail% the no-mail version of %endif%
   the list.
 %endif%
+
 %ifaction release%
+%wrap%
   You have successfully released the message from $posteraddr$ with subject
   "$subject" to the list.
 %endif%
+
 %ifaction reject%
+%wrap%
   You have successfully rejected the message from $posteraddr$ with subject
   "$subject".
 %endif%
+
 %ifaction permit%
+%wrap%
   You have successfully permitted $subaddr$ to join the list.
 %endif%
+
 %ifaction obstruct%
+%wrap%
   You have successfully obstructed $subaddr$ from joining the list.
 %endif%
+
 %ifaction post%
+%wrap%
   %ifreason confirm%
     Thank you for confirming your post.
   %endif%
--- a/en/finish-sub	Tue Feb 22 10:40:00 2011 +1100
+++ b/en/finish-sub	Fri Mar 04 15:24:50 2011 +1100
@@ -20,12 +20,13 @@
 
 The email address you are subscribed with is $reqaddr$.
 
+%ifcontrol closedlist%
 %wrap%
-%ifcontrol closedlist%
   If you ever wish to unsubscribe, you will need to contact a list
   administrator. You can email $list+$owner@$domain$ to contact the list
   owner.
 %else%
+%wrap%
   If you ever wish to unsubscribe, send a message to
   %iftype normal%$list+$unsubscribe@$domain$%endif%
   %iftype digest%$list+$unsubscribe-digest@$domain$%endif%
--- a/en/help	Tue Feb 22 10:40:00 2011 +1100
+++ b/en/help	Fri Mar 04 15:24:50 2011 +1100
@@ -32,8 +32,8 @@
 %else%
   - %wrap%Unsubscribe by emailing: $list+$unsubscribe-digest@$domain$
 %endif%
+%endif%
 
-%endif%
 %ifncontrol nonomailsub%
 - The no-mail version: Subscribers do not receive any posts to the list.
   This means, though, they are able to post to a list which only subscribers
@@ -49,35 +49,34 @@
 %else%
   - %wrap%Unsubscribe by emailing: $list+$unsubscribe-nomail@$domain$
 %endif%
+%endif%
 
-%endif%
 %ifcontrol submod%
 The list has gatekeepers who will review subscription requests before
 permitting new members.
+%endif%
 
-%endif%
 Posts are made by emailing $list$@$domain$
 
 %ifcontrol subonlypost%%ifncontrol modnonsubposts%
 However, only subscribers may post to the list.
+%endif%%endif%
 
-%endif%%endif%
 %ifcontrol moderated%
 The list has moderators who will review all posts before releasing them to
 the list.
-
 %else%
 %ifcontrol subonlypost%%ifcontrol modnonsubposts%
 The list has moderators who will review posts from non-subscribers before
 releasing them to the list.
-
 %endif%%endif%
 %endif%
+
 %ifcontrol access%
 The list also has access rules which may affect who can post and which posts
 are moderated.
+%endif%
 
-%endif%
 %ifncontrol noget%%ifncontrol noarchive%
 %wrap%
 %ifcontrol subonlyget%
@@ -87,8 +86,8 @@
 %endif%
 can retrieve message number N from the list's archive by sending a message
 to $list+$get-N@$domain$ (change the N to the number of the desired message).
+%endif%%endif%
 
-%endif%%endif%
 %wrap%
 You can retrieve the frequently asked questions document for the list by
 sending a message to $list+$faq@$domain$
--- a/en/list	Tue Feb 22 10:40:00 2011 +1100
+++ b/en/list	Fri Mar 04 15:24:50 2011 +1100
@@ -17,3 +17,4 @@
 %endif%
 
 %subs%
+
--- a/en/moderate-post	Tue Feb 22 10:40:00 2011 +1100
+++ b/en/moderate-post	Fri Mar 04 15:24:50 2011 +1100
@@ -25,8 +25,8 @@
 
 %wrap%To release it to the list, please send a message to $releaseaddr$
 which can usually be done simply by replying to this message.
+
 %ifcontrol subonrelease%
-
 If you wish, you can simultaneously release the post and subscribe the
 poster by sending a message to one of the following addresses:
 - Normal version: $listsubreleaseaddr$
--- a/en/notify	Tue Feb 22 10:40:00 2011 +1100
+++ b/en/notify	Fri Mar 04 15:24:50 2011 +1100
@@ -3,8 +3,8 @@
 
 %text prologue%
 
+%ifaction sub%
 %wrap%
-%ifaction sub%
   The address $subaddr$ has been subscribed to
   %iftype normal%%endif%
   %iftype digest% the digest version of %endif%
@@ -23,12 +23,14 @@
     because a gatekeeper permitted it.
   %endif%
 %endif%
+
 %ifaction unsub%
+%wrap%
   The address $subaddr$ has been unsubscribed from
   %iftype normal%%endif%
   %iftype digest% the digest version of %endif%
   %iftype nomail% the no-mail version of %endif%
-  the list.
+  the list
   %ifreason request%
     because a request to unsubscribe was received.
   %endif%
--- a/en/wait-post	Tue Feb 22 10:40:00 2011 +1100
+++ b/en/wait-post	Fri Mar 04 15:24:50 2011 +1100
@@ -21,23 +21,23 @@
 %endif%
 %ifreason modnonsubposts%
 because you are not a subscriber.
+
   %ifncontrol closedlist%%ifncontrol closedlistsub%
-
 %wrap%
     However, this is an open list. If you wish, you can simultaneously
     subscribe and release your post by sending a message to
     $listsubreleaseaddr$ which can usually be done simply by replying to
     this message. The subject and the body of the message can be anything.
+
     %ifncontrol nodigestsub%
-
 %wrap%
       Or you can simultaneously subscribe to the digest version of the list
       and release your post by sending a message to $nomailsubreleaseaddr$
       and you will receive multiple posts in a single message, at regular
       intervals, or when a lot of posts have accumulated.
     %endif%
+
     %ifncontrol nonomailsub%
-
 %wrap%
       Or you can simultaneously subscribe to the no-mail version of the list
       and release your post by sending a message to $nomailsubreleaseaddr$