diff options
| author | Mark Sapiro <mark@msapiro.net> | 2015-02-03 20:48:25 -0800 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2015-02-03 20:48:25 -0800 |
| commit | 680e70a272dbbf7b04b9a68a312a855af195321e (patch) | |
| tree | 32380379e2debee417ae2c4a2388fb7c8c3bf2c5 /Mailman/Gui | |
| parent | 74df7c8b253ab58257e768eccfdc2dd63d9f5f05 (diff) | |
| download | mailman2-680e70a272dbbf7b04b9a68a312a855af195321e.tar.gz mailman2-680e70a272dbbf7b04b9a68a312a855af195321e.tar.xz mailman2-680e70a272dbbf7b04b9a68a312a855af195321e.zip | |
Enhanced subscribe_auto_approval to accept @listname entries.
Diffstat (limited to 'Mailman/Gui')
| -rw-r--r-- | Mailman/Gui/GUIBase.py | 5 | ||||
| -rw-r--r-- | Mailman/Gui/Privacy.py | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Mailman/Gui/GUIBase.py b/Mailman/Gui/GUIBase.py index 9a8b68fb..32d19929 100644 --- a/Mailman/Gui/GUIBase.py +++ b/Mailman/Gui/GUIBase.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2008 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2015 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -80,7 +80,8 @@ class GUIBase: except re.error: bad_addrs.append(addr) elif (wtype == mm_cfg.EmailListEx and addr.startswith('@') - and property.endswith('_these_nonmembers')): + and (property.endswith('_these_nonmembers') or + property == 'subscribe_auto_approval')): # XXX Needs to be reviewed for list@domain names. # don't reference your own list if addr[1:] == mlist.internal_name(): diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py index e6a2fd82..3af5d8ef 100644 --- a/Mailman/Gui/Privacy.py +++ b/Mailman/Gui/Privacy.py @@ -117,10 +117,13 @@ class Privacy(GUIBase): _("""List of addresses (or regexps) whose subscriptions do not require approval."""), - _("""When subscription requires approval, addresses in this list + (_("""When subscription requires approval, addresses in this list are allowed to subscribe without administrator approval. Add addresses one per line. You may begin a line with a ^ character - to designate a (case insensitive) regular expression match.""")), + to designate a (case insensitive) regular expression match.""") + + ' ' + + _("""You may also use the @listname notation to designate the + members of another list in this installation."""))), ('unsubscribe_policy', mm_cfg.Radio, (_('No'), _('Yes')), 0, _("""Is the list moderator's approval required for unsubscription |