From dbde6231ec897379ed38ed4cd015b8ab20ed5fa1 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sat, 16 Jul 2016 15:44:07 -0400
Subject: New template system.  Closes #249

The new template system is introduced for API 3.1.  See
``src/mailman/rest/docs/templates.rst`` for details.
---
 src/mailman/app/membership.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/mailman/app/membership.py')

diff --git a/src/mailman/app/membership.py b/src/mailman/app/membership.py
index 8b4d7ff30..534eed15d 100644
--- a/src/mailman/app/membership.py
+++ b/src/mailman/app/membership.py
@@ -29,9 +29,10 @@ from mailman.interfaces.bans import IBanManager
 from mailman.interfaces.member import (
     AlreadySubscribedError, MemberRole, MembershipIsBannedError,
     NotAMemberError, SubscriptionEvent)
+from mailman.interfaces.template import ITemplateLoader
 from mailman.interfaces.user import IUser
 from mailman.interfaces.usermanager import IUserManager
-from mailman.utilities.i18n import make
+from mailman.utilities.string import expand
 from zope.component import getUtility
 
 
@@ -132,11 +133,11 @@ def delete_member(mlist, email, admin_notif=None, userack=None):
         user = getUtility(IUserManager).get_user(email)
         display_name = user.display_name
         subject = _('$mlist.display_name unsubscription notification')
-        text = make('adminunsubscribeack.txt',
-                    mailing_list=mlist,
-                    listname=mlist.display_name,
-                    member=formataddr((display_name, email)),
-                    )
+        text = expand(getUtility(ITemplateLoader).get(
+            'list:admin:notice:unsubscribe', mlist),
+            mlist, dict(
+                member=formataddr((display_name, email)),
+                ))
         msg = OwnerNotification(mlist, subject, text,
                                 roster=mlist.administrators)
         msg.send(mlist)
-- 
cgit v1.2.3-70-g09d2