From 96dd7c7b5133e629ff9bdf62ff189202cc637b05 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <msapiro@value.net>
Date: Wed, 16 Apr 2014 12:06:44 -0700
Subject: Reordered Munge/Wrap DMARC moderation policy options so site admins
 can allow Wrap but not Munge.

---
 Mailman/Gui/Privacy.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Mailman/Gui')

diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py
index bd992df9..0b8fcb81 100644
--- a/Mailman/Gui/Privacy.py
+++ b/Mailman/Gui/Privacy.py
@@ -241,19 +241,19 @@ class Privacy(GUIBase):
              be sent to moderated members who post to this list.""")),
 
             ('dmarc_moderation_action', mm_cfg.Radio,
-             (_('Accept'), _('Wrap Message'), _('Munge From'), _('Reject'),
+             (_('Accept'), _('Munge From'), _('Wrap Message'), _('Reject'),
                  _('Discard')), 0,
              _("""Action to take when anyone posts to the
              list from a domain with a DMARC Reject%(quarantine)s Policy."""),
 
-             _("""<ul><li><b>Wrap Message</b> -- applies the <a
-             href="?VARHELP=general/from_is_list">from_is_list Wrap
-             Message</a> transformation to these messages.
-
              <p><li><b>Munge From</b> -- applies the <a
              href="?VARHELP=general/from_is_list">from_is_list Munge From</a>
              transformation to these messages.
 
+             _("""<ul><li><b>Wrap Message</b> -- applies the <a
+             href="?VARHELP=general/from_is_list">from_is_list Wrap
+             Message</a> transformation to these messages.
+
              <p><li><b>Reject</b> -- this automatically rejects the message by
              sending a bounce notice to the post's author.  The text of the
              bounce notice can be <a
-- 
cgit v1.2.3