Commit 16f37371 authored by salaun's avatar salaun
Browse files

Apply previous changes to the main trunc


git-svn-id: https://subversion.renater.fr/sympa/trunk@2343 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent dc2e2f9a
From: [% conf.email %]@[% conf.host %]
Subject: [% FILTER qencode %][%|l%]Your document has been installed.[%END%][%END%]
[%|l(filename,list.name,list.host,installed_by)%]Your document %1 for list %2@%3
has been installed by %4 list editor.[%END%]
[%|l(conf.wwsympa_url,list.name)%]The list document repository : %1/d_read/%2[%END%]
From: [% conf.email %]@[% conf.host %]
Subject: [% FILTER qencode %][%|l%]Your document has been rejected.[%END%][%END%]
[%|l(filename,list.name,list.host,rejected_by)%]Your document %1 for list %2@%3
has been rejected by %4 list editor.[%END%]
......@@ -6,10 +6,10 @@ Mime-version: 1.0
Content-Type: multipart/mixed; boundary="[% boundary1 %]"
--[% boundary1 %]
Content-Type: text/plain
Content-Type: text/plain; charset=[%|l%]us-ascii[%END%];
Content-transfer-encoding: [%|l%]7bit[%END%]
[%|l%]Table of content:[%END%]
[%|l%]Table of contents:[%END%]
[% FOREACH m = msg_list %]
[% SET tmp = m.key m = m.value m.NAME = tmp IF m.key.defined %]
......
From: [% from %]
To: [% to %]
Reply-to: [% reply %]
Subject: [% FILTER qencode %][%|l(list.name,date)%]%1 Digest %2[%END%][%END%]
Content-Type: text/plain; charset=[%|l%]us-ascii[%END%];
Content-transfer-encoding: [%|l%]7bit[%END%]
[%|l(list.name,date)%]%1 Digest %2[%END%]
[%|l%]Table of contents:[%END%]
[% FOREACH m = msg_list %]
[% SET tmp = m.key m = m.value m.NAME = tmp IF m.key.defined %]
[% m.id %]. [% m.subject %] - [% m.from %]
[% END %]
----------------------------------------------------------------------
[% FOREACH m = msg_list %]
[% SET tmp = m.key m = m.value m.NAME = tmp IF m.key.defined %]
Date: [% m.date %]
From: [% m.from %]
Subject: [% m.subject %]
[% m.plain_body %]
------------------------------
[% END %]
[%|l(list.name,date)%]End of %1 Digest %2[%END%]
*********************************************
......@@ -7,5 +7,5 @@ mailto:[% conf.email %]@[% conf.host %]?subject=sub%20[% list.name %]
[%|l(user.password)%]your password : %1[%END%]
[%|l%]Everything about this list : [%END%][% conf.wwsympa_url %]/info/[% list.name %]
[%|l%]Unsubscribtion :[%END%]
[%|l%]Unsubscription :[%END%]
mailto:[% conf.email %]@[% conf.host %]?subject=sig%20[% list.name %]%20[% user.email %]
......@@ -7,5 +7,5 @@ mailto:[% conf.email %]@[% conf.host %]?subject=sub%20[% list.name %]
[%|l(user.password)%]your password : %1[%END%]
[%|l%]Everything about this list : [%END%][% conf.wwsympa_url %]/info/[% list.name %]
[%|l%]Unsubscribtion :[%END%]
[%|l%]Unsubscription :[%END%]
mailto:[% conf.email %]@[% conf.host %]?subject=sig%20[% list.name %]%20[% user.email %]
......@@ -33,6 +33,7 @@ subject are recognized.[%END%]
SET [%|l%]<list>[%END%]|* NOMAIL * [%|l%]To suspend the message reception for [%|l%]<list>[%END%][%END%]
SET [%|l%]<list>[%END%]|* DIGEST * [%|l%]Message reception in compilation mode[%END%]
SET <list|*> DIGESTPLAIN * [%|l%]Message reception in compilation mode, sent as a plain text email with all attachments[%END%]
SET [%|l%]<list>[%END%]|* SUMMARY * [%|l%]Receiving the message index only[%END%]
SET [%|l%]<list>[%END%]|* NOTICE * [%|l%]Receiving message subject only[%END%]
......@@ -44,7 +45,7 @@ subject are recognized.[%END%]
INDex [%|l%]<list>[%END%] * [%|l%][%|l%]<list>[%END%] archive file list[%END%]
GET [%|l%]<list>[%END%] <file> * [%|l%]To get <file> of [%|l%]<list>[%END%] archive[%END%]
LAST [%|l%]<list>[%END%] * [%|l%]Used to received the last message from [%|l%]<list>[%END%][%END%]
INVITE [%|l%]<list>[%END%] <email> * [%|l%]Invite <email> for subscribtion in [%|l%]<list>[%END%][%END%]
INVITE [%|l%]<list>[%END%] <email> * [%|l%]Invite <email> for subscription in [%|l%]<list>[%END%][%END%]
CONFIRM [%|l%]<key>[%END%] * [%|l%]Confirmation for sending a message (depending
on the list's configuration)[%END%]
QUIT * [%|l%]Indicates the end of the commands (to ignore a
......
......@@ -32,6 +32,25 @@ Subject: [% FILTER qencode %][%|l(param0)%]subscribers update failed for list %1
[%|l%]Sympa could not include subscribers from external data sources ; the
database or LDAP directory might be unreachable.[%END%]
[%|l%]Check Sympa log files for more precise information[%END%]
[% ELSIF type == 'automatic_bounce_management' -%]
Subject: [% FILTER qencode %][%|l(list.name)%]List %1 automatic bounce management[%END%][%END%]
[% IF action == 'notify_bouncers' -%]
[%|l(total,list.name)%]Because we received MANY non-delivery reports, the %1 subscribers listed below have been
notified that they might be removed from list %2:[%END%]
[% ELSIF action == 'remove_bouncers' -%]
[%|l(total,list.name)%]Because we received MANY non-delivery reports, the %1 subscribers listed below have been
removed from list %2:[%END%]
[% ELSIF action == 'none' -%]
[%|l(total,list.name)%]Because we received MANY non-delivery reports, the %1 subscribers listed below have been
selected by Sympa as severe bouncing addresses:[%END%]
[%END%]
[% FOREACH user = user_list %]
[% user %]
[%END%]
[%|l%]Managing bouncing subscribers:[%END%] [conf->wwsympa_url]/reviewbouncing/[list->name]
[% ELSE -%]
Subject: [% FILTER qencode %][% type %][%END%]
......
......@@ -14,4 +14,23 @@ Subject: [% FILTER qencode %][%|l(list.name,rate)%]List "%1" warning : archive %
[%|l(list.name,size)%]Total size used for %1@%2 Bytes.[%END%]
[%|l(conf.host)%]Messages are still archived but you should contact listmaster@%1[%END%].
[% ELSIF type == 'automatic_bounce_management' -%]
Subject: [% FILTER qencode %][%|l(list.name)%]List %1 automatic bounce management[%END%][%END%]
[% IF action == 'notify_bouncers' -%]
[%|l(total,list.name)%]Because we received MANY non-delivery reports, the %1 subscribers listed below have been
notified that they might be removed from list %2:[%END%]
[% ELSIF action == 'remove_bouncers' -%]
[%|l(total,list.name)%]Because we received MANY non-delivery reports, the %1 subscribers listed below have been
removed from list %2:[%END%]
[% ELSIF action == 'none' -%]
[%|l(total,list.name)%]Because we received MANY non-delivery reports, the %1 subscribers listed below have been
selected by Sympa as severe bouncing addresses:[%END%]
[%END%]
[% FOREACH user = user_list %]
[% user %]
[%END%]
[%|l%]Managing bouncing subscribers:[%END%] [conf->wwsympa_url]/reviewbouncing/[list->name]
[% END %]
From: [% conf.email %]@[% conf.host %]
To:
[% IF type == 'auto_notify_bouncers' %]
Subject: [% FILTER qencode %][%|l(list.name)%]Your bouncing address in list %1[%END%][%END%]
[%|l(list.name,to,subscriber.first_bounce)%]Messages from list %1 that were sent to your address %2
generated non-delivery reports since %3.
If this problem persists, you will be automatically unsubscribed from the list.[%END%]
[%|l%]You can contact list owner:[%END%] [% list.name %]-request@[% conf.host %]
[% END %]
Content-Type: text/plain; charset=[%|l%]us-ascii[%END%]; name="[% file_name %]"
Content-Disposition: inline; filename="[% file_name %]"
Content-Transfer-Encoding: [%|l%]7bit[%END%]
[%|l(file_name)%]The %1 file that was initially attached to this message has been stored of the mailing lists server:[%END%]
[% file_url %]
......@@ -10,7 +10,7 @@ Content-transfer-encoding: 8bit
[%|l(list.name,list.host)%]Welcome to list %1@%2[%END%]
[%|l(user.email)%]Your subscription email is %3[%END%]
[% IF user.password %]
[%|l(user.password)%]Your password : %1[%END%]
[%|l(user.password)%]Your password: %1.[%END%]
[% END %]
[% INSERT "${list.dir}/info" %]
......@@ -31,7 +31,7 @@ Content-transfer-encoding: 8bit
[%|l(user.email)%]Your subscription email is %1[%END%]
[% IF user.password %]
<BR>
[%|l(user.password)%]Your password : %1[%END%]
[%|l(user.password)%]Your password: %1.[%END%]
[% END %]
<BR><BR>
<PRE>
......
......@@ -9,4 +9,7 @@ to be yours (From: %3).[%END%]
[%|l%]We stopped delivery of this email.[%END%]
[%|l%]May be it is usefull to check your system for viruses.[%END%]
[%|l%]Maybe it is usefull to check your system for viruses.
Note, however, that many viruses fake sender's e-mail address,
so it is possible that the virus didn't come from your computer.
In that case, please disregard this message.[%END%]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment