Skip to content
GitLab
Commit 678db89a authored by sikeda's avatar sikeda
Browse files

[-dev] Removing obsoleted entries from message_report.tt2, and add entries to... 

[-dev] Removing obsoleted entries from message_report.tt2, and add entries to delivery_status_notification.tt2.


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@12587 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent ec891b2a
Hide whitespace changes
Inline Side-by-side
default/mail_tt2/delivery_status_notification.tt2
View file @ 678db89a
......@@ -4,7 +4,7 @@ Content-Type: multipart/report; report-type=delivery-status;
Subject: [% FILTER qencode %][%|loc%]Message was successfully delivered[%END%][%END%]
[% ELSIF status == '4.2.1' -%]
Subject: [% FILTER qencode %][%|loc%]List could not be created[%END%][%END%]
[% ELSIF status == '4.2.4' || status == '5.3.5' -%]
[% ELSIF status == '4.2.4' -%]
Subject: [% FILTER qencode %][%|loc%]List unknown[%END%][%END%]
[% ELSIF status == '5.1.1' || status == '5.1.2' -%]
Subject: [% FILTER qencode %][%|loc%]List unknown[%END%][%END%]
......@@ -12,6 +12,8 @@ Subject: [% FILTER qencode %][%|loc%]List unknown[%END%][%END%]
Subject: [% FILTER qencode %][%|loc%]Too large message[%END%][%END%]
[% ELSIF status == '5.3.0' -%]
Subject: [% FILTER qencode %][%|loc%]Message distribution: Internal server error[%END%][%END%]
[% ELSIF status == '5.3.5' -%]
Subject: [% FILTER qencode %][%|loc%]Message distribution: User error[%END%][%END%]
[% ELSIF status == '5.6.0' -%]
Subject: [% FILTER qencode %][%|loc%]Message distribution: User error[%END%][%END%]
[% ELSIF status == '5.6.5' -%]
......@@ -39,7 +41,7 @@ Content-Description: Notification
[% IF status == '4.2.1' -%]
[%|loc(listname)%]The %1 list could not be created.[%END%]
[% ELSIF status == '4.2.4' || status == '5.3.5' -%]
[% ELSIF status == '4.2.4' -%]
[%|loc(listname)%]List '%1' does not exist.[%END%]
[% ELSIF status == '5.1.2' -%]
......@@ -59,6 +61,11 @@ Note: Because binary files have to be encoded in less-efficient ASCII format bef
[%|loc(list.name,list.host)%]For further information, please contact %1-request@%2[%END -%]
[% ELSIF status == '5.3.5' -%]
[%|loc(listname)%]The %1 list could not be created.[%END%]
[%|loc(conf.listmaster_email,conf.host)%]For further information, please contact %1@%2[%END%]
[% ELSIF status == '5.6.0' -%]
[%|loc(list.name,conf.sympa,list.host,cmd)%]The following message was sent to list '%1' and it contains a line '%4' that can be interpreted as a command.
......
default/mail_tt2/message_report.tt2
View file @ 678db89a
To: [% to %]
[%################# -%]
[%#### INTERN ERROR -%]
[%################# -%]
[% IF type == 'intern_error' -%]
Subject: [% FILTER qencode %][%|loc%]Message distribution: Internal server error[%END%][%END%]
Content-Type: multipart/mixed; boundary="[% boundary %]"
Content-Transfer-Encoding: 8bit
--[% boundary %]
Content-Disposition: inline
[% IF entry == 'forward' -%]
[%|loc(list.name,function)%]Impossible to forward your message to '%1-%2' because of an internal server error.[%END%]
[% ELSE -%]
[%|loc(list.name)%]Impossible to distribute your message for list '%1' because of an internal server error.[%END%]
[% END -%]
[%|loc(list.name,list.host)%]For further information, please contact %1-request@%2[%END -%]
[%################ -%]
[%#### USER ERROR -%]
[%################ -%]
[% ELSIF type == 'user_error' -%]
Subject: [% FILTER qencode %][%|loc%]Message distribution: User error[%END%][%END%]
Content-Type: multipart/mixed; boundary="[% boundary %]"
Content-Transfer-Encoding: 8bit
--[% boundary %]
Content-Disposition: inline
[% IF list.name -%]
[%|loc(list.name)%]Impossible to distribute your message for list '%1' for the following reason:[%END%]
[% ELSE -%]
[%|loc%]Impossible to distribute your message for the following reason:[%END%]
[% END -%]
[% IF entry == 'routing_error' -%]
[%|loc(list.name,conf.sympa,list.host)%]The following message was sent to list '%1' and it seems to contain
one or more commands like subscribe, unsubscribe, help, index, get, ...
If your message contained a command, please notice that
commands should never ever be sent to lists. Commands must be sent
to %2 exclusively.
If your message was really meant to be sent to the list, it was
interpreted by the software as a command. Please contact the list owner:
%1-request@%3 so that he can take care of your message.
Thank you for your attention.
[%END -%]
[% ELSIF entry == 'message_too_large' -%]
[%|loc(msg_size,max_size)%]Your message could not be sent because its size (%1 kB) was over the maximum size (%2 kB) allowed on this list.
Note: Because binary files have to be encoded in less-efficient ASCII format before being sent over email, the final size of an attachment is often significantly larger that the original file.[%END%]
[% ELSIF entry == 'list_unknown' -%]
[%|loc(listname)%]List '%1' does not exist.[%END%]
[% ELSIF entry == 'dyn_cant_create' -%]
[%|loc(listname)%]The %1 list could not be created.[%END%]
[% ELSIF entry == 'unfound_message' -%]
[%|loc(list.name,key)%]Unable to access the message on list %1 with key %2.
Warning: this message may already have been sent by one of the list's editor.[%END%]
[% ELSIF entry == 'unfound_file_message' -%]
[%|loc(key)%]Unable to access the message authenticated with key %1. The message may already been confirmed.[%END%]
[% ELSIF entry == 'wrong_format_message' -%]
[%|loc(key)%]Unable to access the message authenticated with key %1 because of a wrong format. The message may already been confirmed.[%END%]
[% END -%]
[% IF list.name -%]
[%|loc(list.name,list.host)%]For further information, please contact %1-request@%2[%END%]
[% ELSE -%]
[%|loc(conf.host)%]For further information, please contact listmaster@%1[%END%]
[% END -%]
[%##################### -%]
[%# AUTHORIZATION ERROR -%]
[%##################### -%]
[% ELSIF type == 'authorization_reject' -%]
Subject: [% FILTER qencode %][%|loc%]Message distribution: Authorization denied[%END%][%END%]
Content-Type: multipart/mixed; boundary="[% boundary %]"
Content-Transfer-Encoding: 8bit
--[% boundary %]
Content-Disposition: inline
[%|loc(list.name)%]Your message for list '%1' (attached below) was rejected.
You are not allowed to send this message for the following reason:[%END%]
[% SET reason = entry -%] [% PROCESS authorization_reject.tt2 -%]
[%|loc(list.name,list.host)%]For further information, please contact %1-request@%2[%END%]
[%##################### -%]
[%###### SUCCESS NOTICE -%]
[%##################### -%]
[% ELSIF type == 'success' -%]
[%#
- The types 'intern_error', 'user_error', 'authorization_reject' are no longer
supported. Use delivery_status_notification.tt2.
- The type 'plugin' is no longer supported. Use user_notification.tt2.
~%]
Subject: [% FILTER qencode %][%|loc%]Message distribution[%END%][%END%]
[% IF entry == 'moderating_message' -%]
[%|loc(list.name)%]Your message for list %1 has been forwarded to editor(s)[%END%]
[% ELSIF entry == 'message_distributed' -%]
[%|loc(key,list.name)%]Message %1 for list '%2' has been distributed.[%END%]
[% ELSIF entry == 'message_in_distribution_spool' -%]
[%|loc(key,list.name)%]Message %1 for list '%2' has been validated; it will be distributed soon.[%END%]
[% ELSIF entry == 'message_rejected' -%]
[%|loc(key,list.name)%]Message %1 for list '%2' has been rejected.[%END%]
[% ELSIF entry == 'message_confirmed' -%]
[%|loc(key,list.name)%]Your message for list '%2' with the %1 ID has been confirmed and distributed.[%END%]
[% ELSIF entry == 'message_confirmed_and_in_distribution_spool' -%]
[%|loc(key,list.name)%]Your message for list '%2' with the %1 ID has been confirmed; it will be distributed soon.[%END%]
[% END -%]
[%##################### -%]
[%###### PLUGINS -%]
[%##################### -%]
[% ELSIF type == 'plugin' -%]
[%- TRY -%][%- INCLUDE $entry -%]
[%- CATCH -%]
Subject: [%FILTER qencode%][%|loc%]report message error on plugin[%END%][%END%]
ENTRY=[% entry %]
ERROR=[% error %]
[% END -%]
[% ELSE -%]
Subject: oops
[%type %]/[%entry%]
[% END -%]
[%##################### -%]
[%# Inserted MESSAGE -%]
[%##################### -%]
[%- IF msg -%]
--[% boundary %]
Content-Type: message/rfc822
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
X-Sympa-Attach: yes
[%# msg %]
--[% boundary %]--
[%entry%]
[% 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