Utils.maketext() and Utils.findtext() are gone.

3 files changed, 46 insertions, 42 deletions

diff --git a/src/mailman/app/membership.py b/src/mailman/app/membership.py
index 8723fd781..fcbedc2f5 100644
--- a/src/mailman/app/membership.py
+++ b/src/mailman/app/membership.py
@@ -29,7 +29,6 @@ __all__ = [
 from email.utils import formataddr
 from zope.component import getUtility
 
-from mailman import Utils
 from mailman.app.notifications import send_goodbye_message
 from mailman.core.i18n import _
 from mailman.email.message import OwnerNotification
@@ -39,6 +38,7 @@ from mailman.interfaces.member import (
     AlreadySubscribedError, MemberRole, MembershipIsBannedError,
     NotAMemberError)
 from mailman.interfaces.usermanager import IUserManager
+from mailman.utilities.i18n import make
 
 
 
@@ -149,10 +149,10 @@ def delete_member(mlist, address, admin_notif=None, userack=None):
         user = getUtility(IUserManager).get_user(address)
         realname = user.real_name
         subject = _('$mlist.real_name unsubscription notification')
-        text = Utils.maketext(
-            'adminunsubscribeack.txt',
-            {'listname': mlist.real_name,
-             'member'  : formataddr((realname, address)),
-             }, mlist=mlist)
+        text = make('adminunsubscribeack.txt',
+                    mailing_list=mlist,
+                    listname=mlist.real_name,
+                    member=formataddr((realname, address)),
+                    )
         msg = OwnerNotification(mlist, subject, text)
         msg.send(mlist)
diff --git a/src/mailman/app/moderator.py b/src/mailman/app/moderator.py
index cdfedd44b..50a03c833 100644
--- a/src/mailman/app/moderator.py
+++ b/src/mailman/app/moderator.py
@@ -48,6 +48,7 @@ from mailman.interfaces.member import (
     AlreadySubscribedError, DeliveryMode, NotAMemberError)
 from mailman.interfaces.messages import IMessageStore
 from mailman.interfaces.requests import IRequests, RequestType
+from mailman.utilities.i18n import make
 
 
 NL = '\n'
@@ -209,12 +210,12 @@ def hold_subscription(mlist, address, realname, password, mode, language):
     if mlist.admin_immed_notify:
         subject = _(
             'New subscription request to list $mlist.real_name from $address')
-        text = Utils.maketext(
-            'subauth.txt',
-            {'username'   : address,
-             'listname'   : mlist.fqdn_listname,
-             'admindb_url': mlist.script_url('admindb'),
-             }, mlist=mlist)
+        text = make('subauth.txt',
+                    mailing_list=mlist,
+                    username=address,
+                    listname=mlist.fqdn_listname,
+                    admindb_url=mlist.script_url('admindb'),
+                    )
         # This message should appear to come from the <list>-owner so as
         # to avoid any useless bounce processing.
         msg = UserNotification(
@@ -281,12 +282,12 @@ def hold_unsubscription(mlist, address):
     if mlist.admin_immed_notify:
         subject = _(
             'New unsubscription request from $mlist.real_name by $address')
-        text = Utils.maketext(
-            'unsubauth.txt',
-            {'address'   : address,
-             'listname'   : mlist.fqdn_listname,
-             'admindb_url': mlist.script_url('admindb'),
-             }, mlist=mlist)
+        text = make('unsubauth.txt',
+                    mailing_list=mlist,
+                    address=address,
+                    listname=mlist.fqdn_listname,
+                    admindb_url=mlist.script_url('admindb'),
+                    )
         # This message should appear to come from the <list>-owner so as
         # to avoid any useless bounce processing.
         msg = UserNotification(
@@ -336,13 +337,14 @@ def _refuse(mlist, request, recip, comment, origmsg=None, lang=None):
         lang = (mlist.preferred_language
                 if member is None
                 else member.preferred_language)
-    text = Utils.maketext(
-        'refuse.txt',
-        {'listname' : mlist.fqdn_listname,
-         'request'  : request,
-         'reason'   : comment,
-         'adminaddr': mlist.owner_address,
-        }, lang=lang.code, mlist=mlist)
+    text = make('refuse.txt',
+                mailing_list=mlist,
+                language=lang.code,
+                listname=mlist.fqdn_listname,
+                request=request,
+                reason=comment,
+                adminaddr=mlist.owner_address,
+                )
     with _.using(lang.code):
         # add in original message, but not wrap/filled
         if origmsg:
diff --git a/src/mailman/app/notifications.py b/src/mailman/app/notifications.py
index 985f4eece..d7e64a020 100644
--- a/src/mailman/app/notifications.py
+++ b/src/mailman/app/notifications.py
@@ -30,11 +30,12 @@ __all__ = [
 from email.utils import formataddr
 from lazr.config import as_boolean
 
-from mailman import Utils
+from mailman.Utils import wrap
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.email.message import OwnerNotification, UserNotification
 from mailman.interfaces.member import DeliveryMode
+from mailman.utilities.i18n import make
 
 
 
@@ -54,7 +55,7 @@ def send_welcome_message(mlist, address, language, delivery_mode, text=''):
     :type delivery_mode: DeliveryMode
     """
     if mlist.welcome_msg:
-        welcome = Utils.wrap(mlist.welcome_msg) + '\n'
+        welcome = wrap(mlist.welcome_msg) + '\n'
     else:
         welcome = ''
     # Find the IMember object which is subscribed to the mailing list, because
@@ -62,15 +63,16 @@ def send_welcome_message(mlist, address, language, delivery_mode, text=''):
     member = mlist.members.get_member(address)
     options_url = member.options_url
     # Get the text from the template.
-    text += Utils.maketext(
-        'subscribeack.txt', {
-            'real_name'         : mlist.real_name,
-            'posting_address'   : mlist.fqdn_listname,
-            'listinfo_url'      : mlist.script_url('listinfo'),
-            'optionsurl'        : options_url,
-            'request_address'   : mlist.request_address,
-            'welcome'           : welcome,
-            }, lang=language.code, mlist=mlist)
+    text += make('subscribeack.txt',
+                 mailing_list=mlist,
+                 language=language.code,
+                 real_name=mlist.real_name,
+                 posting_address=mlist.fqdn_listname,
+                 listinfo_url=mlist.script_url('listinfo'),
+                 optionsurl=options_url,
+                 request_address=mlist.request_address,
+                 welcome=welcome,
+                 )
     if delivery_mode is not DeliveryMode.regular:
         digmode = _(' (Digest mode)')
     else:
@@ -98,7 +100,7 @@ def send_goodbye_message(mlist, address, language):
     :type language: string
     """
     if mlist.goodbye_msg:
-        goodbye = Utils.wrap(mlist.goodbye_msg) + '\n'
+        goodbye = wrap(mlist.goodbye_msg) + '\n'
     else:
         goodbye = ''
     msg = UserNotification(
@@ -124,10 +126,10 @@ def send_admin_subscription_notice(mlist, address, full_name, language):
     with _.using(mlist.preferred_language.code):
         subject = _('$mlist.real_name subscription notification')
     full_name = full_name.encode(language.charset, 'replace')
-    text = Utils.maketext(
-        'adminsubscribeack.txt',
-        {'listname' : mlist.real_name,
-         'member'   : formataddr((full_name, address)),
-         }, mlist=mlist)
+    text = make('adminsubscribeack.txt',
+                mailing_list=mlist,
+                listname=mlist.real_name,
+                member=formataddr((full_name, address)),
+                )
     msg = OwnerNotification(mlist, subject, text)
     msg.send(mlist)