Factor out most of the i18n subsystem and convert to using the flufl.i18n

package.

4 files changed, 10 insertions, 10 deletions

diff --git a/src/mailman/queue/__init__.py b/src/mailman/queue/__init__.py
index f3a0b04e9..a0af49355 100644
--- a/src/mailman/queue/__init__.py
+++ b/src/mailman/queue/__init__.py
@@ -50,8 +50,8 @@ from lazr.config import as_boolean, as_timedelta
 from zope.component import getUtility
 from zope.interface import implements
 
-from mailman import i18n
 from mailman.config import config
+from mailman.core.i18n import _
 from mailman.email.message import Message
 from mailman.interfaces.listmanager import IListManager
 from mailman.interfaces.runner import IRunner
@@ -438,7 +438,7 @@ class Runner:
                         else mlist.preferred_language)
         else:
             language = mlist.preferred_language
-        with i18n.using_language(language.code):
+        with _.using(language.code):
             msgdata['lang'] = language.code
             keepqueued = self._dispose(mlist, msg, msgdata)
         if keepqueued:
diff --git a/src/mailman/queue/bounce.py b/src/mailman/queue/bounce.py
index 3d2ef6140..f293e6508 100644
--- a/src/mailman/queue/bounce.py
+++ b/src/mailman/queue/bounce.py
@@ -28,14 +28,15 @@ from lazr.config import as_timedelta
 
 from mailman.Bouncers import BouncerAPI
 from mailman.config import config
+from mailman.core.i18n import _
 from mailman.email.utils import split_email
-from mailman.i18n import _
 from mailman.queue import Runner
 
+
 COMMASPACE = ', '
 
-log     = logging.getLogger('mailman.bounce')
-elog    = logging.getLogger('mailman.error')
+log = logging.getLogger('mailman.bounce')
+elog = logging.getLogger('mailman.error')
 
 
 
diff --git a/src/mailman/queue/command.py b/src/mailman/queue/command.py
index d32361cf9..178d2ba0b 100644
--- a/src/mailman/queue/command.py
+++ b/src/mailman/queue/command.py
@@ -38,8 +38,8 @@ from email.Iterators import typed_subpart_iterator
 from zope.interface import implements
 
 from mailman.config import config
+from mailman.core.i18n import _
 from mailman.email.message import Message, UserNotification
-from mailman.i18n import _
 from mailman.interfaces.command import ContinueProcessing, IEmailResults
 from mailman.queue import Runner
 
diff --git a/src/mailman/queue/digest.py b/src/mailman/queue/digest.py
index 3dbfc7917..479eb5350 100644
--- a/src/mailman/queue/digest.py
+++ b/src/mailman/queue/digest.py
@@ -38,11 +38,10 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.utils import formatdate, getaddresses, make_msgid
 
-from mailman import i18n
 from mailman.Utils import maketext, oneline, wrap
 from mailman.config import config
 from mailman.core.errors import DiscardMessage
-from mailman.i18n import _
+from mailman.core.i18n import _
 from mailman.interfaces.member import DeliveryMode, DeliveryStatus
 from mailman.pipeline.decorate import decorate
 from mailman.pipeline.scrubber import process as scrubber
@@ -299,8 +298,8 @@ class DigestRunner(Runner):
         volume = msgdata['volume']
         digest_number = msgdata['digest_number']
         with nested(Mailbox(msgdata['digest_path']),
-                    i18n.using_language(mlist.preferred_language.code)) as (
-            mailbox, language_code):
+                    _.using(mlist.preferred_language.code)) as (mailbox,
+                                                                language_code):
             # Create the digesters.
             mime_digest = MIMEDigester(mlist, volume, digest_number)
             rfc1153_digest = RFC1153Digester(mlist, volume, digest_number)