Mark Sapiro pushed to branch master at GNU Mailman / Mailman Core
Commits:
c97c175f by Mark Sapiro at 2021-05-08T15:19:29-07:00
Add list:admin:notice:increment to template list and alphabetize.
- - - - -
ae1e83b9 by Mark Sapiro at 2021-05-08T22:44:53+00:00
Merge branch 'templates' into 'master'
Add list:admin:notice:increment to template list and alphabetize.
See merge request mailman/mailman!856
- - - - -
1 changed file:
- src/mailman/rest/docs/templates.rst
Changes:
=====================================
src/mailman/rest/docs/templates.rst
=====================================
@@ -470,6 +470,24 @@ below. Here are all the supported template names:
* ``member`` - display name and email address of the subscriber
+* ``list:admin:notice:disable``
+ Sent to the list administrators to notify them when a member's delivery
+ is disabled due to excessive bounces.
+
+ * ``member`` - display name and email address of the subscriber
+
+* ``list:admin:notice:increment``
+ When configured, sent to the list administrators to notify them when a
+ member's bounce score is incremented.
+
+ * ``member`` - display name and email address of the subscriber
+
+* ``list:admin:notice:removal``
+ Sent to the list administrators to notify them when a member is unsubscribed
+ from am mailing list due to excessive bounces.
+
+ * ``member`` - display name and email address of the subscriber
+
* ``list:admin:notice:subscribe``
Sent to the list administrators to notify them when a new member has
been subscribed.
@@ -486,18 +504,6 @@ below. Here are all the supported template names:
* ``member`` - display name and email address of the subscriber
-* ``list:admin:notice:disable``
- Sent to the list administrators to notify them when a member's delivery
- is disabled due to excessive bounces.
-
- * ``member`` - display name and email address of the subscriber
-
-* ``list:admin:notice:removal``
- Sent to the list administrators to notify them when a member is unsubscribed
- from am mailing list due to excessive bounces.
-
- * ``member`` - display name and email address of the subscriber
-
* ``list:member:digest:footer``
The footer for a digest message.
@@ -540,6 +546,12 @@ below. Here are all the supported template names:
or their email address if no display name
(e.g. "Anne Person", "Bart", or "fper...@example.com")
+* ``list:user:action:invite``
+ The message sent to subscribers when they are invited to join a List.
+
+ * ``user_email`` - the email address being invited.
+ * ``token`` - the unique confirmation token
+
* ``list:user:action:subscribe``
The message sent to subscribers when a subscription confirmation is
required.
@@ -562,12 +574,6 @@ below. Here are all the supported template names:
to; this corresponds to the ``Reply-To`` header
* ``user_email`` - the email address being confirmed
-* ``list:user:action:invite``
- The message sent to subscribers when they are invited to join a List.
-
- * ``user_email`` - the email address being invited.
- * ``token`` - the unique confirmation token
-
* ``list:user:notice:goodbye``
The notice sent to a member when they unsubscribe from a mailing list.
@@ -611,18 +617,18 @@ below. Here are all the supported template names:
* ``reasons`` - some reasons why the post was rejected
+* ``list:user:notice:warning``
+ The notice sent to a member when their membership has been disabled due to
+ excessive bounces.
+
+ * ``user_email`` - the email address of the bouncing member.
+
* ``list:user:notice:welcome``
The notice sent to a member when they are subscribed to the mailing list.
* ``user_name`` - the display name of the new member
* ``user_email`` - the email address of the new member
-* ``list:user:notice:warning``
- The notice sent to a member when their membership has been disabled due to
- excessive bounces.
-
- * ``user_email`` - the email address of the bouncing member.
-
.. _requests: http://docs.python-requests.org/en/master/
.. _`Mailman's internal use`:
https://gitlab.com/mailman/mailman/blob/master/src/mailman/utilities/i18n.py#L45
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/44bf9a638f1c7af0d349d4af4601a129e2423789...ae1e83b9d859ff83bb364b0b7960cec4ea6d1213
--
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/44bf9a638f1c7af0d349d4af4601a129e2423789...ae1e83b9d859ff83bb364b0b7960cec4ea6d1213
You're receiving this email because of your account on gitlab.com.
_______________________________________________
Mailman-checkins mailing list -- mailman-checkins@python.org
To unsubscribe send an email to mailman-checkins-le...@python.org
https://mail.python.org/mailman3/lists/mailman-checkins.python.org/
Member address: arch...@jab.org
