8 files changed, 9 insertions, 9 deletions
diff --git a/src/mailman/commands/cli_control.py b/src/mailman/commands/cli_control.py
index cab3d0fd9..3b4bae9b9 100644
--- a/src/mailman/commands/cli_control.py
+++ b/src/mailman/commands/cli_control.py
@@ -36,7 +36,7 @@ import logging
 from zope.interface import implements
 
 from mailman.config import config
-from mailman.i18n import _
+from mailman.core.i18n import _
 from mailman.interfaces.command import ICLISubCommand
 
 
diff --git a/src/mailman/commands/cli_info.py b/src/mailman/commands/cli_info.py
index b5a0e8e5d..8d08e93b9 100644
--- a/src/mailman/commands/cli_info.py
+++ b/src/mailman/commands/cli_info.py
@@ -30,7 +30,7 @@ import sys
 from zope.interface import implements
 
 from mailman.config import config
-from mailman.i18n import _
+from mailman.core.i18n import _
 from mailman.interfaces.command import ICLISubCommand
 from mailman.version import MAILMAN_VERSION_FULL
 
diff --git a/src/mailman/commands/cli_inject.py b/src/mailman/commands/cli_inject.py
index d1b1a9795..025dcb036 100644
--- a/src/mailman/commands/cli_inject.py
+++ b/src/mailman/commands/cli_inject.py
@@ -31,7 +31,7 @@ from zope.component import getUtility
 from zope.interface import implements
 
 from mailman.config import config
-from mailman.i18n import _
+from mailman.core.i18n import _
 from mailman.inject import inject_text
 from mailman.interfaces.command import ICLISubCommand
 from mailman.interfaces.listmanager import IListManager
diff --git a/src/mailman/commands/cli_lists.py b/src/mailman/commands/cli_lists.py
index 212dba8af..d5686eca5 100644
--- a/src/mailman/commands/cli_lists.py
+++ b/src/mailman/commands/cli_lists.py
@@ -35,8 +35,8 @@ from mailman.app.lifecycle import create_list, remove_list
 from mailman.config import config
 from mailman.core.constants import system_preferences
 from mailman.core.errors import InvalidEmailAddress
+from mailman.core.i18n import _
 from mailman.email.message import UserNotification
-from mailman.i18n import _, using_language
 from mailman.interfaces.command import ICLISubCommand
 from mailman.interfaces.domain import (
     BadDomainSpecificationError, IDomainManager)
@@ -210,7 +210,7 @@ class Create:
             # Set the I18N language to the list's preferred language so the
             # header will match the template language.  Stashing and restoring
             # the old translation context is just (healthy? :) paranoia.
-            with using_language(mlist.preferred_language.code):
+            with _.using(mlist.preferred_language.code):
                 msg = UserNotification(
                     args.owners, mlist.no_reply_address,
                     _('Your new mailing list: $fqdn_listname'),
diff --git a/src/mailman/commands/cli_members.py b/src/mailman/commands/cli_members.py
index d818d2853..b26216785 100644
--- a/src/mailman/commands/cli_members.py
+++ b/src/mailman/commands/cli_members.py
@@ -34,7 +34,7 @@ from zope.interface import implements
 
 from mailman.app.membership import add_member
 from mailman.config import config
-from mailman.i18n import _
+from mailman.core.i18n import _
 from mailman.interfaces.command import ICLISubCommand
 from mailman.interfaces.listmanager import IListManager
 from mailman.interfaces.member import DeliveryMode
diff --git a/src/mailman/commands/eml_echo.py b/src/mailman/commands/eml_echo.py
index 30590acf8..77c944cda 100644
--- a/src/mailman/commands/eml_echo.py
+++ b/src/mailman/commands/eml_echo.py
@@ -25,7 +25,7 @@ __all__ = [
 
 from zope.interface import implements
 
-from mailman.i18n import _
+from mailman.core.i18n import _
 from mailman.interfaces.command import ContinueProcessing, IEmailCommand
 
 
diff --git a/src/mailman/commands/eml_end.py b/src/mailman/commands/eml_end.py
index a9298bc92..e47712030 100644
--- a/src/mailman/commands/eml_end.py
+++ b/src/mailman/commands/eml_end.py
@@ -26,7 +26,7 @@ __all__ = [
 
 from zope.interface import implements
 
-from mailman.i18n import _
+from mailman.core.i18n import _
 from mailman.interfaces.command import ContinueProcessing, IEmailCommand
 
 
diff --git a/src/mailman/commands/eml_join.py b/src/mailman/commands/eml_join.py
index d1f9dd816..f29684b93 100644
--- a/src/mailman/commands/eml_join.py
+++ b/src/mailman/commands/eml_join.py
@@ -28,7 +28,7 @@ from email.utils import formataddr, parseaddr
 from zope.interface import implements
 
 from mailman.config import config
-from mailman.i18n import _
+from mailman.core.i18n import _
 from mailman.interfaces.command import ContinueProcessing, IEmailCommand
 from mailman.interfaces.domain import IDomainManager
 from mailman.interfaces.member import DeliveryMode