Commit 2a07ccc3 authored by IKEDA Soji's avatar IKEDA Soji
Browse files

Removing unnecessary newlines in templates.

parent 1e528bc3
title.gettext Web forum ML
<ul><li>[%|loc%]Messages can either be read via email (subscription) or
via the web (web archives)[%END%]</li>
<ul><li>[%|loc%]Messages can either be read via email (subscription) or via the web (web archives)[%END%]</li>
</ul>
......@@ -2,14 +2,11 @@
Subject: [% FILTER qencode %][%|loc(list.name)%]List %1 automatic bounce management[%END%][%END%]
[% IF action == 'notify_bouncers' -%]
[%|loc(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%]
[%|loc(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' -%]
[%|loc(total,list.name)%]Because we received MANY non-delivery reports, the %1 subscribers listed below have been
removed from list %2:[%END%]
[%|loc(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' -%]
[%|loc(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%]
[%|loc(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 IN user_list -%]
......
......@@ -29,9 +29,7 @@ X-Loop: [% conf.email %]@[% conf.host %]
[%|loc%]Your message contain a DKIM signature. It was succesfully verified[%END%]
[% ELSIF notice.entry == 'sent_to_owner' -%]
[%|loc%]Your request to subscribe/unsubscribe has been forwarded to the list's
owners for approval. You will receive a notification when you have
been subscribed (or unsubscribed) to the list.[%END-%]
[%|loc%]Your request to subscribe/unsubscribe has been forwarded to the list's owners for approval. You will receive a notification when you have been subscribed (or unsubscribed) to the list.[%END-%]
[% ELSIF notice.entry == 'updated_info' -%]
[%|loc(notice.email,notice.listname)%]Information regarding user %1 has been updated for list %2.[%END%]
......@@ -112,8 +110,7 @@ been subscribed (or unsubscribed) to the list.[%END-%]
[%|loc%]Command not understood: ignoring end of message.[%END%]
[% ELSIF u_err.entry == 'no_verify_sign' -%]
[%|loc%]Your message was not a multipart/signed message or Sympa could not verify the signature
(be aware that Sympa can't check signature if you use the subject header to write a command).[%END-%]
[%|loc%]Your message was not a multipart/signed message or Sympa could not verify the signature (be aware that Sympa can't check signature if you use the subject header to write a command).[%END-%]
[% ELSIF u_err.entry == 'syntax_errors' -%]
[%|loc%]Command syntax error.[%END%]
......
......@@ -2,7 +2,6 @@
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc%]Your document has been installed.[%END%][%END%]
[%|loc(filename,list.name,list.host,installed_by)%]Your document %1 for list %2@%3
has been installed by %4 list editor.[%END%]
[%|loc(filename,list.name,list.host,installed_by)%]Your document %1 for list %2@%3 has been installed by %4 list editor.[%END%]
[%|loc%]The list document repository:[%END%] [% 'd_read' | url_abs([list.name]) %]
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc%]Your document has been rejected.[%END%][%END%]
[%|loc(filename,list.name,list.host,rejected_by)%]Your document %1 for list %2@%3
has been rejected by %4 list editor.[%END%]
[%|loc(filename,list.name,list.host,rejected_by)%]Your document %1 for list %2@%3 has been rejected by %4 list editor.[%END%]
......@@ -193,8 +193,7 @@ Subject: [% FILTER qencode %][%|loc%]incorrect format of edit_list.conf[%END%][%
'default' is no more accepted for a population.[%END%]
[%|loc(param0)%]Refer to documentation to adapt %1.[%END%]
[%|loc(param0)%]Until then we recommend your remove %1;
default configuration will be used.[%END%]
[%|loc(param0)%]Until then we recommend your remove %1; default configuration will be used.[%END%]
[% ELSIF type == 'sync_include_failed' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Failed to include members for list '%1'[%END%][%END%]
......
......@@ -10,8 +10,7 @@ To: [% to %]
Subject: [% FILTER qencode %][%|loc(list.name)%]List %1 archive quota exceeded[%END%][%END%]
[%|loc(list.name,list.host,size,conf.host,conf.listmaster_email)%]%1 archive quota exceeded.
Total size used for %1@%2 archive is %3 Bytes. Messages
are no longer being web-archived. Please contact %5@%4. [%END%]
Total size used for %1@%2 archive is %3 Bytes. Messages are no longer being web-archived. Please contact %5@%4.[%END%]
[% ELSIF type == 'arc_quota_95' -%]
Subject: [% FILTER qencode %][%|loc(list.name,rate)%]List "%1" warning: archive %2% full[%END%][%END%]
......@@ -49,9 +48,8 @@ Some of the customizations have been removed because they no longer respect the
Subject: [% FILTER qencode %][%|loc(list.name)%]Subscription request to list %1[%END%][%END%]
[%|loc(list.name)-%]Dear owner of list %1,
A user asked to be added as a subscriber to your list. In order to list and manage
pending subscription requests you should click on the following link:[%END%]
A user asked to be added as a subscriber to your list. In order to list and manage pending subscription requests you should click on the following link:[%END%]
[% 'ticket' | url_abs([one_time_ticket]) %]
......@@ -75,8 +73,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]UNsubscription request from list
[%|loc(list.name)-%]Dear owner of list %1,
A user asked to be deleted from your list. If this is OK
with you, you should click on the following link:[% END %]
A user asked to be deleted from your list. If this is OK with you, you should click on the following link:[% END %]
[% 'ticket' | url_abs([one_time_ticket]) %]
......
......@@ -2,8 +2,7 @@
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc%]Your message has been rejected.[%END%][%END%]
[%|loc(list.name,list.host,rejected_by)%]Your message for list %1@%2
has been rejected by the moderator (%3).[%END%]
[%|loc(list.name,list.host,rejected_by)%]Your message for list %1@%2 has been rejected by the moderator (%3).[%END%]
[%|loc(subject)%](Subject of your mail: %1)[%END%]
......
......@@ -2,8 +2,7 @@
To: [% newuser.email %]
Subject: [% FILTER qencode %][%|loc(conf.title)%]%1 / your environment[%END%][%END%]
[%|loc%]To complete your account setup actions you need to confirm that you have
supplied a working email address. Please follow the link below to complete your account configuration.[%END%]
[%|loc%]To complete your account setup actions you need to confirm that you have supplied a working email address. Please follow the link below to complete your account configuration.[%END%]
[% 'sso_login' | url_abs([server.key,'confirmemail',init_email,one_time_ticket]) %]
......
......@@ -3,8 +3,7 @@ To: [% to %]
[% IF type == 'auto_notify_bouncers' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Your bouncing address in list %1[%END%][%END%]
[%|loc(list.name,to,subscriber.first_bounce)%]Messages from list %1 that were sent to your address %2
have generated non-delivery reports since %3.
[%|loc(list.name,to,subscriber.first_bounce)%]Messages from list %1 that were sent to your address %2 have generated non-delivery reports since %3.
If this problem persists, you will be automatically unsubscribed from the list.[%END%]
[%|loc%]You can contact list owner:[%END%] [% list.name %]-request@[% conf.host %]
......@@ -46,8 +45,7 @@ Subject: [% FILTER qencode %][%|loc%]Changing your subscriber email address[%END
[% ELSIF type == 'ticket_to_signoff' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Unsubscribing from list %1[%END%][%END%]
[% IF context == 'auto_signoff'%]
[%|loc(list.name,ip)%]Somebody (probably you) requested to unsubscribe you from list %1.
This query was issued from the IP number '%2'.
[%|loc(list.name,ip)%]Somebody (probably you) requested to unsubscribe you from list %1. This query was issued from the IP number '%2'.
To confirm and get removed from the list, please click the link below: [%END%]
[% ELSE %]
[%|loc(list.name)%]You have requested to be removed from list %1. To confirm and get removed from the list, please click the link below: [%END%]
......@@ -57,8 +55,7 @@ To confirm and get removed from the list, please click the link below: [%END%]
[% ELSIF type == 'ticket_to_family_signoff' -%]
Subject: [% FILTER qencode %][%|loc(family)%]Unsubscribing from family %1[%END%][%END%]
[% IF context == 'family_signoff'%]
[%|loc(family,ip)%]Somebody (probably you) requested to unsubscribe you from family %1.
This query was issued from the IP number '%2'.
[%|loc(family,ip)%]Somebody (probably you) requested to unsubscribe you from family %1. This query was issued from the IP number '%2'.
To confirm and get removed from all the lists of this family, please click the link below: [%END%]
[% ELSE %]
[%|loc(family)%]You have requested to be removed from family %1. To confirm and get removed from all the lists of this family, please click the link below: [%END%]
......@@ -69,10 +66,8 @@ To confirm and get removed from all the lists of this family, please click the l
[% ELSIF type == 'hundred_percent_error' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]No valid receipient in list %1[%END%][%END%]
[%|loc(list.name, conf.listmaster_email, list.domain) %]
You message to list %1 could not be delivered. All the subscribers to this list have their address in error.
Please contact the listmaster (%2@%3) to fix this probem before re-posting your message.
[% END %]
[%|loc(list.name, conf.listmaster_email, list.domain) %]You message to list %1 could not be delivered. All the subscribers to this list have their address in error.
Please contact the listmaster (%2@%3) to fix this probem before re-posting your message.[% END %]
[% ELSIF type == 'plugin' -%]
[%- TRY -%][%- INCLUDE $entry -%]
......
......@@ -5,10 +5,8 @@ Subject: [% FILTER qencode %][%|loc(list.name,list.host)%]encrypted message for
[%|loc(mail.sender,mail.subject)%]An encrypted message from %1 has been distributed to
Subject: %2[%END%]
[%|loc(user.email)%]It was not possible to send you the message because the mailing list manager
was unable to access your personal certificate (email %1).[%END%]
[%|loc(conf.email,conf.host)%]Please, in order to receive future encrypted messages send a signed message
to %1@%2 .[%END%]
[%|loc(user.email)%]It was not possible to send you the message because the mailing list manager was unable to access your personal certificate (email %1).[%END%]
[%|loc(conf.email,conf.host)%]Please, in order to receive future encrypted messages send a signed message to %1@%2.[%END%]
[%|loc%]Information about this list:[%END%]
[% 'info' | url_abs([list.name]) %]
title.gettext Moderated, need authentication from editor
title.gettext Moderated, need authentication from editor
is_editor([listname],[sender]) smtp,dkim -> request_auth
true() smtp,dkim,smime,md5 -> editorkey
<!-- close_list.tt2 -->
<strong>[% list %]</strong> [%|loc%]list has been closed. Its subscribers have been deleted from
the subscriber database. The list is no longer public on the site.[%END%]
<strong>[% list %]</strong> [%|loc%]list has been closed. Its subscribers have been deleted from the subscriber database. The list is no longer public on the site.[%END%]
<br /><br />
[% IF auto_aliases %]
[%|loc%]List aliases have been removed.[%END%]
......
......@@ -11,9 +11,8 @@
[% END %]
[% ELSE %]
[%|loc%]Your list creation request is registered. You can now modify its
configuration using the admin button but the list will be unusable until the listmaster validates it.[%END%]
[%|loc%]Your list creation request is registered. You can now modify its configuration using the admin button but the list will be unusable until the listmaster validates it.[%END%]
[% END %]
<!-- end create_list.tt2 -->
</div>
\ No newline at end of file
</div>
......@@ -154,8 +154,7 @@
[%#####################-%]
[% FOREACH auth = auth_rejects %]
[%|loc(auth.action)%]AUTHORIZATION REJECT (%1)[%END-%]
[% IF auth.change_email_failed %][%|loc(auth.listname)%]Could not change your subscription address for the list '%1'
because your new address is not allowed to subscribe/unsubscribe:[%END%][% END %]
[% IF auth.change_email_failed %][%|loc(auth.listname)%]Could not change your subscription address for the list '%1' because your new address is not allowed to subscribe/unsubscribe:[%END%][% END %]
[% SET reason = auth.msg -%]
[% IF reason == 'edit_right' %][% SET role = auth.role -%][% SET right = auth.right -%][% END -%]
[% PROCESS authorization_reject.tt2 -%]
......
......@@ -5,25 +5,18 @@
<ul>
<li>[%|helploc%]Digest[%END%]<br />
[%|helploc%]Instead of receiving individual mail messages from the list, the subscriber will periodically
receive batched messages in a Digest. This Digest compiles a group of messages from the list, using
the multipart/digest MIME format.[%END%]
[%|helploc%]Instead of receiving individual mail messages from the list, the subscriber will periodically receive batched messages in a Digest. This Digest compiles a group of messages from the list, using the multipart/digest MIME format.[%END%]
<br /><br />
[%|helploc%]The sending interval for these Digests is defined by the list owner.[%END%]<br /><br /></li>
<li>[%|helploc%]DigestPlain[%END%]<br />
[%|helploc%]Similar to the Digest option in that the subscriber will periodically
receive batched messages in a Digest. With DigestPlain the Digest is sent in a plain text
format, with all attachments stripped out. DigestPlain is useful if your email software doesn't
display multipart/digest format messages well.[%END%]
[%|helploc%]Similar to the Digest option in that the subscriber will periodically receive batched messages in a Digest. With DigestPlain the Digest is sent in a plain text format, with all attachments stripped out. DigestPlain is useful if your email software doesn't display multipart/digest format messages well.[%END%]
<br /><br />
[%|helploc%]The sending interval for these Digests is defined by the list owner.[%END%]<br /><br /></li>
<li>[%|helploc%]Summary[%END%]<br />
[%|helploc%]Instead of receiving individual mail messages from the list, the subscriber will periodically
receive a list of messages. This mode is very close to the Digest reception mode but the
subscriber receives only the list of messages.[%END%]
[%|helploc%]Instead of receiving individual mail messages from the list, the subscriber will periodically receive a list of messages. This mode is very close to the Digest reception mode but the subscriber receives only the list of messages.[%END%]
<br /><br /></li>
<li>[%|helploc%]Nomail[%END%] <br />
......@@ -32,28 +25,23 @@ subscriber receives only the list of messages.[%END%]
<li>Txt <br />
[%|helploc%]This mode is used when a subscriber wishes to receive mails sent in both HTML and plain text formats
only in plain text format.[%END%]<br /><br /></li>
[%|helploc%]This mode is used when a subscriber wishes to receive mails sent in both HTML and plain text formats only in plain text format.[%END%]<br /><br /></li>
<li>Html<br />
[%|helploc%]This mode is used when a subscriber wishes to receive mails sent in both HTML and plain text formats
only in HTML format.[%END%]<br /><br /></li>
[%|helploc%]This mode is used when a subscriber wishes to receive mails sent in both HTML and plain text formats only in HTML format.[%END%]<br /><br /></li>
<li>Urlize<br />
[%|helploc%]This mode is used when a subscriber does not want to receive attached files. The attached files are
replaced by a URL leading to the file stored on the list site.[%END%] <br /><br /></li>
[%|helploc%]This mode is used when a subscriber does not want to receive attached files. The attached files are replaced by a URL leading to the file stored on the list site.[%END%] <br /><br /></li>
<li>Not_me<br />
[%|helploc%]This mode is used when a subscriber does not want to receive copies of messages that he or she has sent to
the list.[%END%] <br /><br /></li>
[%|helploc%]This mode is used when a subscriber does not want to receive copies of messages that he or she has sent to the list.[%END%] <br /><br /></li>
<li>Normal<br />
[%|helploc%]This option is used mainly to cancel the nomail, summary or digest modes. If the subscriber was
in nomail mode, he or she will again receive individual mail messages from the list.[%END%] <br /><br /></li>
[%|helploc%]This option is used mainly to cancel the nomail, summary or digest modes. If the subscriber was in nomail mode, he or she will again receive individual mail messages from the list.[%END%] <br /><br /></li>
</ul>
<!-- end help_user_options.tt2 -->
<!-- remove_arc.tt2 -->
[% IF status == 'done' %]
[%|loc%]Operation successful. The message will be deleted as soon
as possible. This task may be performed in a few minutes.[%END%]
[%|loc%]Operation successful. The message will be deleted as soon as possible. This task may be performed in a few minutes.[%END%]
[% ELSIF status == 'no_msgid' %]
[%|loc%]Unable to find the message to delete, probably this message
was received without Message-Id. Please refer to listmaster with
complete URL of the message concerned[%END%]
[%|loc%]Unable to find the message to delete, probably this message was received without Message-Id. Please refer to listmaster with complete URL of the message concerned[%END%]
[% ELSIF status == 'not_found' %]
[%|loc%]Unable to find the message to delete[%END%]
[% ELSE %]
[%|loc%]Error while deleting this message, please refer to listmaster with
complete URL of the message concerned.[%END%]
[%|loc%]Error while deleting this message, please refer to listmaster with complete URL of the message concerned.[%END%]
[% END %]
<!-- end remove_arc.tt2 -->
......@@ -2,10 +2,7 @@
<div class="block">
<h2>[%|loc%]Exclusion table[%END%]</h2>
<p>[%|loc%]Users listed below are excluded from the list. Beware, that this feature is different from the blacklist. Exclusion makes sense
when a list is based on external data sources ; thanks to exclusion, a user can unsubscribe (or being removed by list owner) even though
he should be included via an external data source. Users get into the exclusion table, through the standard unsubscribe/delete functions.
They get off the exclusion table with the standard subscribe/add functions.[%END%]</p>
<p>[%|loc%]Users listed below are excluded from the list. Beware, that this feature is different from the blacklist. Exclusion makes sense when a list is based on external data sources ; thanks to exclusion, a user can unsubscribe (or being removed by list owner) even though he should be included via an external data source. Users get into the exclusion table, through the standard unsubscribe/delete functions. They get off the exclusion table with the standard subscribe/add functions.[%END%]</p>
[% IF exclude_users ~%]
<form class="noborder toggleContainer"
......
<!-- sigrequest.tt2 -->
[% IF status == 'user.email' %]
[%|loc(list)%]You asked to be unsubscribed from list %1[%END%]. <br />[%|loc%]To confirm
your request, please click the button below:[%END%]<br />
[%|loc(list)%]You asked to be unsubscribed from list %1[%END%]. <br />[%|loc%]To confirm your request, please click the button below:[%END%]<br />
<br />
<form action="[% path_cgi %]" method="post">
......@@ -17,8 +16,7 @@
[%|loc(list,email)%]You are not subscribed to list %1 with e-mail address %2[%END%].
<br /><br />
[%|loc%]You might have subscribed with another address.
Please contact the list owner to help you unsubscribe:[%END%]
[%|loc%]You might have subscribed with another address. Please contact the list owner to help you unsubscribe:[%END%]
[% '' | mailto("${list}-request@${conf.host}") %]
[% ELSIF ! email %]
......
......@@ -9,13 +9,11 @@
<h2>[%|loc%]Colors[%END%]</h2>
<p>
[%|loc%]Use the color editor in order to change defined colors. First select the color you want to change and pick a color,then apply it using the test button. The new color is not really installed but it is used only for your own session. When happy with the different colors you chosen, you may save them in a new static CSS.
[%END%]
[%|loc%]Use the color editor in order to change defined colors. First select the color you want to change and pick a color,then apply it using the test button. The new color is not really installed but it is used only for your own session. When happy with the different colors you chosen, you may save them in a new static CSS.[%END%]
</p>
<p>
[%|loc%]
Be careful: the CSS file is overwritten using css.tt2 template, usually this file is coming from Sympa distribution so your CSS customization may be erased when doing this.[% END %]
[%|loc%]Be careful: the CSS file is overwritten using css.tt2 template, usually this file is coming from Sympa distribution so your CSS customization may be erased when doing this.[% END %]
[%|loc%]So if you want to preserve some site customization from being overwriten when starting a new sympa version, css_path and css_url should not point to the same directory.[%END%]
</p>
......
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