diff options
| author | bwarsaw | 2000-12-26 18:45:45 +0000 |
|---|---|---|
| committer | bwarsaw | 2000-12-26 18:45:45 +0000 |
| commit | de3e1b7a4cab3c5ad6b06018f42ecb208b8bef7e (patch) | |
| tree | 56d9ba1412c4a6b1c9987752d4dbb30842bbbcab /Mailman | |
| parent | 1f7fd712043c8d7646cbdb3dcf70eb1fbc9a12a4 (diff) | |
| download | mailman-de3e1b7a4cab3c5ad6b06018f42ecb208b8bef7e.tar.gz mailman-de3e1b7a4cab3c5ad6b06018f42ecb208b8bef7e.tar.zst mailman-de3e1b7a4cab3c5ad6b06018f42ecb208b8bef7e.zip | |
Latest set of I18N patches from jcrey. Specifically,
SendSubscribeAck(), SendUnsubscribeAck(), MailUserPassword(): Set
$LANG to user's preferred language. Call maketext() with language.
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Deliverer.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Mailman/Deliverer.py b/Mailman/Deliverer.py index c7547fb62..9024f4cbf 100644 --- a/Mailman/Deliverer.py +++ b/Mailman/Deliverer.py @@ -30,6 +30,7 @@ from Mailman.Handlers import HandlerAPI class Deliverer: def SendSubscribeAck(self, name, password, digest): + os.environ['LANG'] = pluser = self.GetPreferredLanguage(name) if not self.send_welcome_msg: return if self.welcome_msg: @@ -55,20 +56,21 @@ your membership administrative address, %s. 'listinfo_url': self.GetScriptURL('listinfo', absolute=1), 'optionsurl' : self.GetOptionsURL(name, absolute=1), 'password' : password, - }) + }, pluser) if digest: - digmode = ' (Digest mode)' + digmode = _(" (Digest mode)") else: digmode = '' msg = Message.UserNotification( self.GetMemberAdminEmail(name), self.GetRequestEmail(), - _('Welcome to the "%s" mailing list%s') % (self.real_name, digmode), + _('Welcome to the "%s" mailing list%s') %(self.real_name, digmode), text) msg['X-No-Archive'] = 'yes' HandlerAPI.DeliverToUser(self, msg) def SendUnsubscribeAck(self, name): + os.environ['LANG'] = self.GetPreferredLanguage(name) msg = Message.UserNotification( self.GetMemberAdminEmail(name), self.GetAdminEmail(), _('Unsubscribed from "%s" mailing list') % self.real_name, @@ -77,6 +79,7 @@ your membership administrative address, %s. def MailUserPassword(self, user): + os.environ['LANG'] = self.GetPreferredLanguage(user) listfullname = '%s@%s' % (self.real_name, self.host_name) ok = 1 # find the lowercased version of the user's address @@ -96,7 +99,7 @@ your membership administrative address, %s. 'options_url': self.GetOptionsURL(user, absolute=1), 'requestaddr': requestaddr, 'adminaddr' : adminaddr, - }) + }, self.GetPreferredLanguage(user)) else: ok = 0 recipient = self.GetAdminEmail() @@ -105,7 +108,7 @@ your membership administrative address, %s. 'nopass.txt', {'username' : `user`, 'internal_name': self.internal_name(), - }) + }, self.GetPreferredLanguage(user)) msg = Message.UserNotification(recipient, requestaddr, subject, text) msg['X-No-Archive'] = 'yes' HandlerAPI.DeliverToUser(self, msg) |
