update

Author: jaredmauch

Mailman/Bouncer.py

@@ -327,7 +327,7 @@ def sendNextNotification(self, member):
         # BAW: See the comment in MailList.py ChangeMemberAddress() for why we
         # set the Subject this way.
         del msg['subject']
-        msg['Subject'] = 'confirm ' + info.cookie
+        msg['Subject'] = _('confirm %(cookie)s') % {'cookie': info.cookie}
         # Send without Precedence: bulk.  Bug #808821.
         msg.send(self, noprecedence=True)
         info.noticesleft -= 1

Mailman/Handlers/Hold.py

@@ -289,7 +289,7 @@ def hold_for_approval(mlist, msg, msgdata, exc):
             d['confirmurl'] = '%s/%s' % (mlist.GetScriptURL('confirm', absolute=1),
                                          cookie)
             lang = msgdata.get('lang', mlist.getMemberLanguage(sender))
-            subject = _('Your message to %(listname)s awaits moderator approval')
+            subject = _('Your message to %(listname)s awaits moderator approval') % {'listname': listname}
             text = Utils.maketext('postheld.txt', d, lang=lang, mlist=mlist)
             nmsg = UserNotification(sender, owneraddr, subject, text, lang)
             nmsg.send(mlist)

Mailman/Handlers/ToDigest.py

@@ -228,7 +228,11 @@ def send_digests(mlist, mboxpath):
     # Set up the digest state
     volume = mlist.volume
     issue = mlist.next_digest_number
-    digestid = _('%(realname)s Digest, Vol %(volume)d, Issue %(issue)d')
+    digestid = _('%(realname)s Digest, Vol %(volume)d, Issue %(issue)d') % {
+        'realname': mlist.real_name,
+        'volume': volume,
+        'issue': issue
+    }
 
     # Get the list's preferred language and charset
     lang = mlist.preferred_language

Mailman/MailList.py

@@ -248,7 +248,7 @@ def GetConfirmJoinSubject(self, listname, cookie):
             cset = i18n.get_translation().charset() or \
                        Utils.GetCharSet(self.preferred_language)
             subj = Header(
-     _('Your confirmation is required to join the %(listname)s mailing list'),
+     _('Your confirmation is required to join the %(listname)s mailing list') % {'listname': listname},
                           cset, header_name='subject')
             return subj
         else:
@@ -259,7 +259,7 @@ def GetConfirmLeaveSubject(self, listname, cookie):
             cset = i18n.get_translation().charset() or \
                        Utils.GetCharSet(self.preferred_language)
             subj = Header(
-     _('Your confirmation is required to leave the %(listname)s mailing list'),
+     _('Your confirmation is required to leave the %(listname)s mailing list') % {'listname': listname},
                           cset, header_name='subject')
             return subj
         else:

cron/checkdbs

@@ -191,7 +191,12 @@ def pending_requests(mlist):
                 pending.append(_("""\
 From: %(sender)s on %(date)s
 Subject: %(subject)s
-Cause: %(reason)s"""))
+Cause: %(reason)s""") % {
+                    'sender': sender,
+                    'date': date,
+                    'subject': subject,
+                    'reason': reason
+                })
                 pending.append('')
             except Exception as e:
                 mailman_log('error', 'Error processing held message record %d: %s\n%s',