selfmoderate: adapt the text send to the user

diff --git a/listtexts/ast/moderate-post b/listtexts/ast/moderate-post
index 49b65f436c3726b09f7d12a65f12cf8a78ac7aa7..43cf7d42e4f73e5573bc540d531a335a07e3d1cc 100644 (file)
--- a/listtexts/ast/moderate-post
+++ b/listtexts/ast/moderate-post
@@ -12,6 +12,9 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Se recibió un mensaxe de <$posteraddr$> col asuntu "$subject$" unviáu
 pa espublizar. Te pedimos que lu moderes
+%ifreason selfmoderated%
+  porque yes el remitente y nun tas subscriptor.
+%endif%
 %ifreason modnonsubposts%
   porque'l remitente nun ye suscriptor.
 %endif%
@@ -37,8 +40,10 @@ de vezu val con simplemente responder a esti mensaxe.
 %wrap%Si nun quies facer denguna d'estes coses, o manda un mensaxe a
 <$rejectaddr$> o simplemente salta esti mensaxe.
 
+%ifnreason selfmoderated%
 Recibieron esti corréu los siguientes moderadores:
 - %moderators%
+%%endif
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822

diff --git a/listtexts/cs/moderate-post b/listtexts/cs/moderate-post
index 467ca742e96fdce191d4962f459c6cf5ac3653d2..c240ba1bb5d10873f44a8c5eca336bfb6ee353ec 100644 (file)
--- a/listtexts/cs/moderate-post
+++ b/listtexts/cs/moderate-post
@@ -11,6 +11,9 @@ Content-Transfer-Encoding: 8bit
 %text prologue%
 
 %wrap%Zpráva od <$posteraddr$> s předmětem "$subject$" byla zaslána a nastal požadavek na moderování,
+%ifreason selfmoderated%
+  protože jsi odesílatel a nejsi konference.
+%endif%
 %ifreason modnonsubposts%
   protože odesílatel není členem konference.
 %endif%
@@ -36,8 +39,10 @@ což lze většinou udělat jen odpovědí na tento emailový požadavek.
 %wrap%Pokud nechcete zprávu odeslat, zašlete zprávu na <$rejectaddr$>, 
 nebo prostě jednoduše tento email ignorujte.
 
+%ifnreason selfmoderated%
 Následující moderátoři obrželi tento požadavek:
 - %moderators%
+%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822

diff --git a/listtexts/de/moderate-post b/listtexts/de/moderate-post
index d214684ea7c4dbba80afc59a1b6d3b20329214ee..d3c9ed6d59a3b1158cd7004f1434dd5cc1701b42 100644 (file)
--- a/listtexts/de/moderate-post
+++ b/listtexts/de/moderate-post
@@ -12,6 +12,9 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Eine Nachricht von <$posteraddr$> mit dem Betreff "$subject$" wurde an
 die Liste geschickt. Sie sollten die Nachricht moderieren,
+%ifreason selfmoderated%
+  weil du der Absender bist und nicht Abonnent bist.
+%endif%
 %ifreason modnonsubposts%
   da der Absender kein Abonnent ist.
 %endif%
@@ -39,8 +42,10 @@ diese Nachricht.
 %wrap%Wenn Sie nichts davon ausführen möchten, Senden Sie eine Mail an
 <$rejectaddr$> oder ignorieren Sie einfach diese Mail.
 
+%ifnreason selfmoderated%
 Folgende Moderatoren haben diese Mail erhalten:
 - %moderators%
+%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822

diff --git a/listtexts/en/moderate-post b/listtexts/en/moderate-post
index 18944c3a0f822b11e7c5e8e5c6ebb5c5663e2471..f4f029da2b451e867fef4268774bec5a74a0e9c3 100644 (file)
--- a/listtexts/en/moderate-post
+++ b/listtexts/en/moderate-post
@@ -12,6 +12,9 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%A message from <$posteraddr$> with subject "$subject$" has been
 submitted for posting. You are being asked to moderate
+%ifreason selfmoderated%
+  because you are the requester and not subscribed.
+%endif%
 %ifreason modnonsubposts%
   because the requester is not a subscriber.
 %endif%
@@ -38,8 +41,10 @@ which can usually be done simply by replying to this message.
 %wrap%If you do not want to do any of this, either send a message to
 <$rejectaddr$> or simply ignore this message.
 
+%ifnreason selfmoderated%
 The following moderators have received this mail:
 - %moderators%
+%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822

diff --git a/listtexts/fi/moderate-post b/listtexts/fi/moderate-post
index 9f7b46eeb3a45f045eb61a368982e221310755d1..0fe12fcfaff9df5cbf95bc0f0ecd0bb30fcddf31 100644 (file)
--- a/listtexts/fi/moderate-post
+++ b/listtexts/fi/moderate-post
@@ -12,6 +12,9 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Viesti osoitteesta <$posteraddr$> otsikolla "$subject$" on lähetetty
 listalle välitettäväksi. Sinua pyydetään moderoimaan viesti, koska
+%ifreason selfmoderated%
+ Koska olet lähettäjä etkä ole tilaaja.
+%endif%
 %ifreason modnonsubposts%
   viestin lähettäjä ei ole listan tilaaja.
 %endif%
@@ -38,8 +41,10 @@ Viesti on luettavissa alla.
 %wrap%Jos et halua viestiä hyväksyttävän, lähetä viesti osoitteeseen
 <$rejectaddr$> tai jätä tämä viesti kokonaan huomioimatta.
 
+%ifnreason selfmoderated%
 Seuraavat moderaattorit ovat saaneet tämän viestin:
 - %moderators%
+%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822

diff --git a/listtexts/fr/moderate-post b/listtexts/fr/moderate-post
index 6b1f5292365dbb2fd189414e390a854094591b43..dba8d7f5358229acd6a3a147767c58eda5b3f37b 100644 (file)
--- a/listtexts/fr/moderate-post
+++ b/listtexts/fr/moderate-post
@@ -12,6 +12,9 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Un message de <$posteraddr$> ayant pour sujet "$subject$" a été soumis
 pour envoi. Il vous est demandé de le modérer 
+%ifreason selfmoderated%
+  parce que vous êtes le demandeur et n'êtes pas inscrit.
+%endif%
 %ifreason modnonsubposts%
   parce que le demandeur n'est pas inscrit.
 %endif%
@@ -39,8 +42,10 @@ Le message est ci-dessous.
 %wrap%Si vous ne souhaitez faire aucune de ces actions, vous pouvez envoyer
 un message à <$rejectaddr$> ou simplement ignorer ce message.
 
+%ifnreason selfmoderated%
 Les modérateurs suivants ont reçu ce mail :
 - %moderators%
+%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822

diff --git a/listtexts/gr/moderate-post b/listtexts/gr/moderate-post
index cb41e8ffd7356106cdb776ca8994a68347202726..14a9478a7af6396f5abe824d2431e90cf8099f80 100644 (file)
--- a/listtexts/gr/moderate-post
+++ b/listtexts/gr/moderate-post
@@ -12,6 +12,9 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Το μήνυμα με αποστολέα <$posteraddr$> και θέμα "$subject$" πρέπει να
 ελεγχθεί πριν τη δημοσίευσή του
+%ifreason selfmoderated%
+  Επειδή είσαι ο αποστολέας και δεν είσαι εγγεγραμμένος.
+%endif%
 %ifreason modnonsubposts%
   καθώς ο αποστολέας του μηνύματος δεν είναι εγγεγραμμένος στη λίστα.
 %endif%
@@ -41,8 +44,10 @@ Content-Transfer-Encoding: 8bit
 %wrap%Αν δεν επιθυμείτε να κάνετε τίποτα από τα παραπάνω τότε στείλτε ένα
 μήνυμα στο <$rejectaddr$> ή απλά αγνοήστε το μήνυμα αυτό.
 
+%ifnreason selfmoderated%
 Το μήνυμα αυτό απεστάλη στους παρακάτω διαχειριστές :
 - %moderators%
+%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822

diff --git a/listtexts/it/moderate-post b/listtexts/it/moderate-post
index 6d9f2d54757003d2cdaa5f66ba74b97f638fb4a0..8a0f6e5214dff2371ded119b11432829daf0c0ba 100644 (file)
--- a/listtexts/it/moderate-post
+++ b/listtexts/it/moderate-post
@@ -12,6 +12,9 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%È stato inviato un messaggio da <$posteraddr$> con oggetto
 "$subject$". Ti è stato richiesto di moderarlo
+%ifreason selfmoderated%
+  perché siete il richiedente e non siete inscritto/a.
+%endif%
 %ifreason modnonsubposts%
   perché il/la richiedente non è un/a iscritto/a.
 %endif%

diff --git a/listtexts/pt/moderate-post b/listtexts/pt/moderate-post
index d5bf0dc0f43237d36236ce56753d3443667ad9b0..6e70eb66ce25ad15ff9fde2aed27894550121f5a 100644 (file)
--- a/listtexts/pt/moderate-post
+++ b/listtexts/pt/moderate-post
@@ -12,6 +12,9 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%A mensagem de <$posteraddr$> com o assunto "$subject$" foi enviada
 para publicação. Esta mensagem requer moderação
+%ifreason selfmoderated%
+  porque és o remetente e não estás subscriptor.
+%endif%
 %ifreason modnonsubposts%
   porque o remetente não é um subscritor.
 %endif%
@@ -38,8 +41,10 @@ bastando, para o efeito, responder a esta mensagem.
 %wrap%Se não o quiser fazer, envie uma mensagem para <$rejectaddr$> ou
 ignore esta mensagem.
 
+%ifnreason selfmoderated%
 Os seguintes moderadores receberam esta mensagem:
 - %moderators%
+%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822

diff --git a/listtexts/sk/moderate-post b/listtexts/sk/moderate-post
index 4f834336ac4f88be86c6261d4582db5fb05ecbe0..f8216aeac7b701e934d274ff6b107b1b2e3de767 100644 (file)
--- a/listtexts/sk/moderate-post
+++ b/listtexts/sk/moderate-post
@@ -12,6 +12,9 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Od <$posteraddr$> bola na zverejnenie doručená správa s predmetom
 "$subject$". Žiadame Vás o jej preverenie,
+%ifreason selfmoderated%
+  lebo si odosielateľ a nie si abonentom.
+%endif%
 %ifreason modnonsubposts%
   lebo jej odosielateľ nie je abonentom diskusie.
 %endif%
@@ -38,8 +41,10 @@ Správa je pripojená nižšie.
 %wrap%Ak nechcete vykonať žiadnu z týchto akcií, pošlite mail na
 <$rejectaddr$> alebo jednoducho túto správu ignorujte.
 
+%ifnreason selfmoderated%
 Túto správu dostali nasledujúci moderátori:
 - %moderators%
+%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822

diff --git a/listtexts/zh-cn/moderate-post b/listtexts/zh-cn/moderate-post
index d2003f14cc402b4e9552fa726043d2c29b0d199a..ec60ea1bc9a2c69bf1b29561389fe72db3aba793 100644 (file)
--- a/listtexts/zh-cn/moderate-post
+++ b/listtexts/zh-cn/moderate-post
@@ -11,6 +11,9 @@ Content-Transfer-Encoding: 8bit
 %text prologue%
 
 %wrap%来自 <$posteraddr$> 题为《\=$subject$\=》的邮件已提交发布\=。
+%ifreason selfmoderated%
+  因为你是发件人，并且你没有订阅。，
+%endif%
 %ifreason modnonsubposts%
   由于请求者不是订户\=，
 %endif%
@@ -35,8 +38,10 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%如果您不打算通过\=，请发邮件到 <$rejectaddr$> 或直接忽略本邮件\=。
 
+%ifnreason selfmoderated%
 本邮件已发给下述版主\=：
 - %moderators%
+%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822

diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c
index 3f5f3f8a505bb7f3af3f0b025e69956e0b54d410..c43d9d6f2148231ea1520f27b318767ca3a2a54d 100644 (file)
--- a/src/mlmmj-process.c
+++ b/src/mlmmj-process.c
@@ -60,7 +60,8 @@ enum modreason {
        MODNONSUBPOSTS,
        MODNONMODPOSTS,
        ACCESS,
-       MODERATED
+       MODERATED,
+       SELFMODERATED
 };
 
 
@@ -68,7 +69,8 @@ static char *modreason_strs[] = {
        "modnonsubposts",
        "modnonmodposts",
        "access",
-       "moderated"
+       "moderated",
+       "selfmoderated"
 };
 
 
@@ -147,10 +149,12 @@ static void newmoderated(struct ml *ml, const char *mailfilename,
 
        selfmoderate = statctrl(ml->ctrlfd, "selfmoderate");
 
-       if (selfmoderate)
+       if (selfmoderate) {
                to = xstrdup(posteraddr);
-       else
+               modreason = SELFMODERATED;
+       } else {
                xasprintf(&to, "%s-moderators@%s", ml->name, ml->fqdn);
+       }
 
        txt = open_text(ml->fd, "moderate", "post",
                        modreason_strs[modreason], NULL, "moderation");

diff --git a/tests/mlmmj-receive.in b/tests/mlmmj-receive.in
index 75e2d350475d2c3506e4acfc16bfd62df16427e5..635cf1de446a4918e9950315ae5f60f67ff6c9ae 100644 (file)
--- a/tests/mlmmj-receive.in
+++ b/tests/mlmmj-receive.in
@@ -1881,9 +1881,11 @@ moderation_test_body() {
        if [ $# -eq 1 ]; then
                moderator="$1"
                rcpto="$1"
+               self=1
        else
                moderator="test-moderators@mlmmjtest"
                rcpto="me@modos"
+               self=0
        fi
 
 cat > first <<EOF
@@ -1917,8 +1919,19 @@ Content-Transfer-Encoding: 8bit
 Hi, this is the Mlmmj program managing the <test@mlmmjtest> mailing list.\r
 \r
 A message from <bob@test> with subject "yeah" has been submitted for\r
+EOF
+       if [ $self -eq 0 ]; then
+       cat >> expected-1.txt <<EOF
 posting. You are being asked to moderate because this is a moderated list.\r
 The message is below.\r
+EOF
+       else
+cat >> expected-1.txt <<EOF
+posting. You are being asked to moderate because you are the requester and\r
+not subscribed. The message is below.\r
+EOF
+       fi
+       cat >> expected-1.txt <<EOF
 \r
 To release it to the list, please send a message to\r
 <test+release-@mlmmjtest> which can usually be done simply\r
@@ -1927,9 +1940,15 @@ by replying to this message.
 If you do not want to do any of this, either send a message to\r
 <test+reject-@mlmmjtest> or simply ignore this message.\r
 \r
+EOF
+       if [ $self -eq 0 ]; then
+       cat >> expected-1.txt <<EOF
 The following moderators have received this mail:\r
 - me@modos\r
 \r
+EOF
+       fi
+       cat >> expected-1.txt <<EOF
 --=boundary=\r
 Content-Type: message/rfc822\r
 Content-Transfer-Encoding: 8bit\r