diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2019-11-11 21:15:57 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2019-11-11 21:15:57 +0900 |
| commit | 9cf674e0573c1c5f5cbb914a0626ab89f2f00707 (patch) | |
| tree | 4334aed7acd8001fd82c07104de97640640f1460 /Mailman/MailList.py | |
| parent | 436c7209b6abc78e9f294535cee54e187d6f4dca (diff) | |
| parent | 74f050981cd4dca57451ea74a1ec4a8b3dba153f (diff) | |
| download | mailman2-9cf674e0573c1c5f5cbb914a0626ab89f2f00707.tar.gz mailman2-9cf674e0573c1c5f5cbb914a0626ab89f2f00707.tar.xz mailman2-9cf674e0573c1c5f5cbb914a0626ab89f2f00707.zip | |
merge lp:mailman/2.1 up to rev 1827
Diffstat (limited to '')
| -rw-r--r-- | Mailman/MailList.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index f4b38b49..12d75aff 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -386,6 +386,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, self.obscure_addresses = mm_cfg.DEFAULT_OBSCURE_ADDRESSES self.admin_member_chunksize = mm_cfg.DEFAULT_ADMIN_MEMBER_CHUNKSIZE self.administrivia = mm_cfg.DEFAULT_ADMINISTRIVIA + self.drop_cc = mm_cfg.DEFAULT_DROP_CC self.preferred_language = mm_cfg.DEFAULT_SERVER_LANGUAGE self.available_languages = [] self.include_rfc2369_headers = 1 @@ -968,8 +969,9 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, cookie = self.pend_new(Pending.SUBSCRIPTION, userdesc) # Send the user the confirmation mailback if remote is None: - by = remote = '' + oremote = by = remote = '' else: + oremote = remote by = ' ' + remote remote = _(' from %(remote)s') @@ -996,7 +998,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, msg['Reply-To'] = self.GetRequestEmail(cookie) # Is this confirmation a reply to an email subscribe from this # address? - if remote.lower().endswith(email.lower()): + if oremote.lower().endswith(email.lower()): autosub = 'auto-replied' else: autosub = 'auto-generated' |