diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-06-18 06:44:53 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-06-18 06:44:53 +0900 |
| commit | 5800a4e0bbe034297cfe85a28965cf7f6af3e304 (patch) | |
| tree | 4c05525b107dcdce08aee5f9a2d345f3b926edf1 /Mailman/Bouncer.py | |
| parent | 444648032c9ff3d852874896b5d44f4c5f1eda53 (diff) | |
| parent | 6a069d6f6648a8a4736fdf5b8141af9368cf3456 (diff) | |
| download | mailman2-5800a4e0bbe034297cfe85a28965cf7f6af3e304.tar.gz mailman2-5800a4e0bbe034297cfe85a28965cf7f6af3e304.tar.xz mailman2-5800a4e0bbe034297cfe85a28965cf7f6af3e304.zip | |
merge lp:mailman/2.1 up to 1777
Diffstat (limited to 'Mailman/Bouncer.py')
| -rw-r--r-- | Mailman/Bouncer.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py index 2a1cb539..ae0c012c 100644 --- a/Mailman/Bouncer.py +++ b/Mailman/Bouncer.py @@ -40,7 +40,8 @@ EMPTYSTRING = '' # for time.mktime(). ZEROHOUR_PLUSONEDAY = time.localtime(mm_cfg.days(1))[:3] -def _(s): return s +def D_(s): return s +_ = D_ REASONS = {MemberAdaptor.BYBOUNCE: _('due to excessive bounces'), MemberAdaptor.BYUSER: _('by yourself'), @@ -264,10 +265,12 @@ class Bouncer: reason = self.getDeliveryStatus(member) if info.noticesleft <= 0: # BAW: Remove them now, with a notification message + _ = D_ self.ApprovedDeleteMember( - member, 'disabled address', + member, _('disabled address'), admin_notif=self.bounce_notify_owner_on_removal, userack=1) + _ = i18n._ # Expunge the pending cookie for the user. We throw away the # returned data. self.pend_confirm(info.cookie) |