------------------------------------------------------------
revno: 1869
fixes bug: https://launchpad.net/bugs/1922843
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Wed 2021-04-07 21:34:54 -0700
message:
  Translate 'disabled' when used.
modified:
  Mailman/Bouncer.py
  NEWS


--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1

Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Bouncer.py'
--- Mailman/Bouncer.py	2018-06-18 18:44:49 +0000
+++ Mailman/Bouncer.py	2021-04-08 04:34:54 +0000
@@ -226,12 +226,14 @@
         if self.bounce_notify_owner_on_disable:
             self.__sendAdminBounceNotice(member, msg)
 
-    def __sendAdminBounceNotice(self, member, msg, did=_('disabled')):
+    def __sendAdminBounceNotice(self, member, msg, did=None):
         # BAW: This is a bit kludgey, but we're not providing as much
         # information in the new admin bounce notices as we used to (some of
         # it was of dubious value).  However, we'll provide empty, strange, or
         # meaningless strings for the unused %()s fields so that the language
         # translators don't have to provide new templates.
+        if did is None:
+            did = _('disabled')
         siteowner = Utils.get_site_email(self.host_name)
         text = Utils.maketext(
             'bounce.txt',

=== modified file 'NEWS'
--- NEWS	2021-03-30 19:32:42 +0000
+++ NEWS	2021-04-08 04:34:54 +0000
@@ -19,6 +19,9 @@
       or list's language to avoid a possible UnicodeError when including the
       message body in the reply.  (LP: #1921682)
 
+    - Delivery disabled by bounce notices to admins now have 'disabled'
+      properly translated.  (LP: #1922843)
+
 2.1.34 (26-Jun-2020)
 
   i18n

_______________________________________________
Mailman-checkins mailing list -- mailman-checkins@python.org
To unsubscribe send an email to mailman-checkins-le...@python.org
https://mail.python.org/mailman3/lists/mailman-checkins.python.org/
Member address: arch...@jab.org

Reply via email to