Commit a6805550 authored by olivier.salaun's avatar olivier.salaun
Browse files

[change]fi moderation message when topics are required:

 - keep the standard Subject
 - don't refer to the viewmod web page, it does not allow tagging
 - added attached message
 - made spam-related string localized


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@7174 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent b9d010d8
From: [% fromlist %]
To: [% list.name %]-editor@[% list.host %]
[% IF request_topic -%]Subject: [% FILTER qencode %][%|loc(list.name,msg_from)%]Article to be tagged for list %1 from %2[%END%][%END%]
[% ELSE -%]Subject: [% FILTER qencode %][%|loc(list.name,msg_from)%]Message for list %1 from %2 to be approved[%END%][%END%]
[% END -%]
Subject: [% FILTER qencode %][%|loc(list.name,msg_from)%]Message for list %1 from %2 to be approved[%END%][%END%]
Reply-To: [% conf.email %]@[% conf.host %]
[% IF spam_status != 'spam' -%]
Content-Type: multipart/mixed; boundary="[% boundary %]"
......@@ -18,14 +16,13 @@ Content-Disposition: inline
[%|loc%]To browse the awaiting messages, you should click on the following link:[%END%] <[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]>
[% IF method == 'md5' -%]
[% IF request_topic -%][%|loc(list.name)%]To tag the message in list %1 for the appropriate topic, please use the following link:[%END%]
[% IF request_topic -%][%|loc()%]This mailing list is configured to require topics; that's probably why this message went through the moderation process.[%END%]
[%END%]
[% conf.wwsympa_url %]/viewmod/[% list.name %]/[% modkey %]
[%- ELSE -%]
[%- IF spam_status == 'spam' -%]
Because the new message is suspected to be a spam it is not attached to this one. You must use
the web interface to reject or validate it.
[%|loc%]Because the new message is suspected to be a spam it is not attached to this one. You must use the web interface to reject or validate it.[%END%]
[%- ELSE -%]
[% IF ! request_topic %]
[%|loc(list.name)%]To distribute the attached message in list %1:[%END%]
<[% FILTER escape_url %]mailto:[%conf.sympa%]?subject=DISTRIBUTE [%list.name%] [%modkey%][% END %]>
[%|loc(conf.email,conf.host)%]Or send a message to %1@%2 with the following subject:[%END%]
......@@ -35,7 +32,7 @@ DISTRIBUTE [% list.name %] [% modkey %]
<[% FILTER escape_url %]mailto:[%conf.sympa%]?subject=REJECT [%list.name%] [%modkey%][% END %]>
[%|loc(conf.email,conf.host)%]Or send a message to %1@%2 with the following subject:[%END%]
REJECT [% list.name %] [% modkey %]
[%END%]
[%|loc(conf.wwsympa_url)%]The messages moderating documentation:[%END%] <[% conf.wwsympa_url %]/help/admin#moderate>
--[% boundary %]
......@@ -49,5 +46,4 @@ X-Sympa-Attach: yes
--[% boundary %]--
[%- END -%]
[% END %]
[% END %]
......@@ -7629,7 +7629,8 @@ msgstr "%1 messages are awaiting moderation."
#: ../mail_tt2/moderate.tt2:18
msgid ""
"To browse the awaiting messages, you should click on the following link:"
msgstr "To view the messages, please click on the following URL: %1/ticket/%2"
msgstr ""
"To browse the awaiting messages, you should click on the following link:"
# rtb
#. (list.name)
......@@ -7638,10 +7639,8 @@ msgid ""
"To tag the message in list %1 for the appropriate topic, please use the "
"following link:"
msgstr ""
"To tag the message in list %1 for the appropriate topic, please click on the "
"following URL:\n"
"\n"
"%2/viewmod/%1/%3"
"To tag the message in list %1 for the appropriate topic, please use the "
"following link:"
#. (list.name)
#: ../mail_tt2/moderate.tt2:29
......
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