diff options
| author | bwarsaw | 2001-05-18 20:11:49 +0000 |
|---|---|---|
| committer | bwarsaw | 2001-05-18 20:11:49 +0000 |
| commit | 7a8f2a6322f8ec7b67021dbec84d56bb874a3075 (patch) | |
| tree | be4adeff7527f59e620c46af2c8c619798558529 | |
| parent | 935ad53a536eccf45ba5cf1db8f7b8489a1efe59 (diff) | |
| download | mailman-7a8f2a6322f8ec7b67021dbec84d56bb874a3075.tar.gz mailman-7a8f2a6322f8ec7b67021dbec84d56bb874a3075.tar.zst mailman-7a8f2a6322f8ec7b67021dbec84d56bb874a3075.zip | |
GetConfigInfo(), AddMember(), ConfirmUnsubscription(),
ApprovedAddMember(), DeleteMember():
Instead of passing in the list's preferred language, simple pass in
self; maketext() digs the preferred language out of the list object.
In AddMember(), ConfirmUnsubscription(), and ApprovedAddMember(), the
argument `lang' is also passed in case the user chose a language other
than the list's default.
| -rw-r--r-- | Mailman/MailList.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index b05ce6542..a7460ae39 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -808,15 +808,13 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, _('Header added to mail sent to regular list members'), _('''Text prepended to the top of every immediately-delivery message. ''') + Utils.maketext('headfoot.html', - lang=self.preferred_language, - raw=1)), + raw=1, mlist=self)), ('msg_footer', mm_cfg.Text, (4, WIDTH), 0, _('Footer added to mail sent to regular list members'), _('''Text appended to the bottom of every immediately-delivery message. ''') + Utils.maketext('headfoot.html', - lang=self.preferred_language, - raw=1)), + raw=1, mlist=self)), ] config_info['bounce'] = Bouncer.GetConfigInfo(self) @@ -1046,7 +1044,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, 'remote' : remote, 'listadmin' : self.GetAdminEmail(), 'confirmurl' : confirmurl, - }, lang=lang) + }, lang=lang, mlist=self) msg = Message.UserNotification( recipient, self.GetRequestEmail(), _('%(realname)s -- confirmation of subscription -- confirm %(cookie)s'), @@ -1116,7 +1114,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, 'remote' : remote, 'listadmin' : self.GetAdminEmail(), 'confirmurl' : confirmurl, - }, lang=lang) + }, lang=lang, mlist=self) msg = Message.UserNotification( addr, self.GetRequestEmail(), _('%(realname)s -- confirmation of removal -- confirm %(cookie)s'), @@ -1234,7 +1232,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, "adminsubscribeack.txt", {"listname" : self.real_name, "member" : name, - }, lang=lang) + }, lang=lang, mlist=self) msg = Message.UserNotification( self.owner, mm_cfg.MAILMAN_OWNER, subject, text) msg.send(self) @@ -1286,7 +1284,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, 'adminunsubscribeack.txt', {'member' : name, 'listname': self.real_name, - }, lang=self.preferred_language) + }, mlist=self) msg = Message.UserNotification(self.owner, mm_cfg.MAILMAN_OWNER, subject, text) |