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

package.

6 files changed, 8 insertions, 9 deletions

diff --git a/src/mailman/chains/accept.py b/src/mailman/chains/accept.py
index bd47f42c8..b9bba07f5 100644
--- a/src/mailman/chains/accept.py
+++ b/src/mailman/chains/accept.py
@@ -28,7 +28,7 @@ import logging
 
 from mailman.chains.base import TerminalChainBase
 from mailman.config import config
-from mailman.i18n import _
+from mailman.core.i18n import _
 
 
 log = logging.getLogger('mailman.vette')
diff --git a/src/mailman/chains/builtin.py b/src/mailman/chains/builtin.py
index 05912a2f2..02ca6e0d8 100644
--- a/src/mailman/chains/builtin.py
+++ b/src/mailman/chains/builtin.py
@@ -31,7 +31,7 @@ from zope.interface import implements
 
 from mailman.chains.base import Link
 from mailman.config import config
-from mailman.i18n import _
+from mailman.core.i18n import _
 from mailman.interfaces.chain import IChain, LinkAction
 
 
diff --git a/src/mailman/chains/discard.py b/src/mailman/chains/discard.py
index 1899e0340..d6a381a9c 100644
--- a/src/mailman/chains/discard.py
+++ b/src/mailman/chains/discard.py
@@ -28,7 +28,7 @@ __all__ = [
 import logging
 
 from mailman.chains.base import TerminalChainBase
-from mailman.i18n import _
+from mailman.core.i18n import _
 
 
 log = logging.getLogger('mailman.vette')
diff --git a/src/mailman/chains/headers.py b/src/mailman/chains/headers.py
index 2f85d78d0..31e982294 100644
--- a/src/mailman/chains/headers.py
+++ b/src/mailman/chains/headers.py
@@ -33,7 +33,7 @@ from zope.interface import implements
 
 from mailman.chains.base import Chain, Link
 from mailman.config import config
-from mailman.i18n import _
+from mailman.core.i18n import _
 from mailman.interfaces.chain import IChainIterator, LinkAction
 from mailman.interfaces.rules import IRule
 
diff --git a/src/mailman/chains/hold.py b/src/mailman/chains/hold.py
index b4b510d3b..32e2ce0b3 100644
--- a/src/mailman/chains/hold.py
+++ b/src/mailman/chains/hold.py
@@ -33,12 +33,12 @@ from email.utils import formatdate, make_msgid
 from zope.component import getUtility
 from zope.interface import implements
 
-from mailman import i18n
 from mailman.Utils import maketext, oneline, wrap
 from mailman.app.moderator import hold_message
 from mailman.app.replybot import can_acknowledge
 from mailman.chains.base import TerminalChainBase
 from mailman.config import config
+from mailman.core.i18n import _
 from mailman.email.message import UserNotification
 from mailman.interfaces.autorespond import IAutoResponseSet, Response
 from mailman.interfaces.pending import IPendable, IPendings
@@ -47,7 +47,6 @@ from mailman.interfaces.usermanager import IUserManager
 
 log = logging.getLogger('mailman.vette')
 SEMISPACE = '; '
-_ = i18n._
 
 
 
@@ -104,7 +103,7 @@ def autorespond_to_sender(mlist, sender, lang=None):
              'owneremail': mlist.owner_address,
              },
             lang=lang)
-        with i18n.using_language(lang.code):
+        with _.using(lang.code):
             msg = Message.UserNotification(
                 sender, mlist.owner_address,
                 _('Last autoresponse notification for today'),
@@ -199,7 +198,7 @@ class HoldChain(TerminalChainBase):
         if mlist.admin_immed_notify:
             # Now let's temporarily set the language context to that which the
             # administrators are expecting.
-            with i18n.using_language(mlist.preferred_language.code):
+            with _.using(mlist.preferred_language.code):
                 language = mlist.preferred_language
                 charset = language.charset
                 # We need to regenerate or re-translate a few values in the
diff --git a/src/mailman/chains/reject.py b/src/mailman/chains/reject.py
index 3faf563da..6467cf949 100644
--- a/src/mailman/chains/reject.py
+++ b/src/mailman/chains/reject.py
@@ -29,7 +29,7 @@ import logging
 
 from mailman.app.bounces import bounce_message
 from mailman.chains.base import TerminalChainBase
-from mailman.i18n import _
+from mailman.core.i18n import _
 
 
 log = logging.getLogger('mailman.vette')