diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2020-01-13 09:13:27 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2020-01-13 09:13:27 +0900 |
| commit | 94c85073d1ec6ab111efd2dc6d036d00995cabaa (patch) | |
| tree | 3004c08c04d1204707deef485a1cf5000efaffd5 /Mailman/Cgi/subscribe.py | |
| parent | bfb97f9086b505020158225cfab9964bb4b88f35 (diff) | |
| parent | 6dc4f98f42535c22a3805370c5d45706f40db37d (diff) | |
| download | mailman2-94c85073d1ec6ab111efd2dc6d036d00995cabaa.tar.gz mailman2-94c85073d1ec6ab111efd2dc6d036d00995cabaa.tar.xz mailman2-94c85073d1ec6ab111efd2dc6d036d00995cabaa.zip | |
merge lp:mailman/2.1 up to 1832 (2.1.30rc1)
Diffstat (limited to 'Mailman/Cgi/subscribe.py')
| -rw-r--r-- | Mailman/Cgi/subscribe.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py index ce7940f9..795fc81b 100644 --- a/Mailman/Cgi/subscribe.py +++ b/Mailman/Cgi/subscribe.py @@ -291,6 +291,9 @@ your subscription.""") Your subscription request was deferred because %(x)s. Your request has been forwarded to the list moderator. You will receive email informing you of the moderator's decision when they get to your request.""") + except Errors.MMAlreadyPending: + # User already has a subscription pending + results = _('You already have a subscription pending confirmation') except Errors.MMAlreadyAMember: # Results string depends on whether we have private rosters or not if not privacy_results: |