From 02eb1922e5716e4cd601fee900a5310ede6b7a22 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Sat, 19 Jan 2019 11:52:23 -0800 Subject: [PATCH] Revert "Adds explicit_header_only option" This reverts commit 106e31ec1c794fff45684debd5922c9ca0fe5516. --- src/postorius/doc/news.rst | 7 ++----- src/postorius/forms/list_forms.py | 14 +++++--------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/postorius/doc/news.rst b/src/postorius/doc/news.rst index b713f1a5..142852d6 100644 --- a/src/postorius/doc/news.rst +++ b/src/postorius/doc/news.rst @@ -22,15 +22,12 @@ along with Postorius. If not, see . ===== (201X-XX-XX) -* Expose ``max_num_recipients`` in list settings. (Closes #297) -* Add support for Non-member management in Postorius. (Closes #265) +* Expose ``max_num_recipients`` in list settings. (Closes #297) +* Add support for Non-member management in Postorius. (Closes #265) * `Members` tab in Mailing List settings page is now called `Users`. (Closes #309) * Show pending subscription requests are only pending for Moderator. (Closes #314) -* Add support for ``explicit_header_only`` in list settings. - (See !369) - 1.2.2 ===== diff --git a/src/postorius/forms/list_forms.py b/src/postorius/forms/list_forms.py index ab28d042..a155a507 100644 --- a/src/postorius/forms/list_forms.py +++ b/src/postorius/forms/list_forms.py @@ -484,8 +484,7 @@ class AlterMessagesForm(ListSettingsForm): choices=( ('no_munging', _('No Munging')), ('point_to_list', _('Reply goes to list')), - ('explicit_header', _('Explicit Reply-to header set')), - ('explicit_header_only', _('Explicit Reply-to set; no Cc added'))), + ('explicit_header', _('Explicit Reply-to header set'))), help_text=_( 'Where are replies to list messages directed? No Munging is ' 'strongly recommended for most mailing lists. \nThis option ' @@ -494,13 +493,10 @@ class AlterMessagesForm(ListSettingsForm): 'Reply-To: header is ' 'added by Mailman, although if one is present in the original ' 'message, it is not stripped. Setting this value to either Reply ' - 'to List, Explicit Reply, or Reply Only causes Mailman to insert ' - 'a specific Reply-To: header in all messages, overriding the ' - 'header in the original message if necessary ' - '(Explicit Reply inserts the value of reply_to_address). ' - 'Explicit Reply-to set; no Cc added is useful for' - 'announce-only lists where you want to avoid someone replying ' - 'to the list address. There are many reasons not to introduce or ' + 'to List or Explicit Reply causes Mailman to insert a specific ' + 'Reply-To: header in all messages, overriding the header in the ' + 'original message if necessary (Explicit Reply inserts the value ' + 'of reply_to_address). There are many reasons not to introduce or ' 'override the Reply-To: header. One is that some posters depend ' 'on their own Reply-To: settings to convey their valid return ' 'address. Another is that modifying Reply-To: makes it much more ' -- 2.11.4.GIT