diff options
author | tkikuchi <> | 2004-10-19 05:07:42 +0000 |
---|---|---|
committer | tkikuchi <> | 2004-10-19 05:07:42 +0000 |
commit | 4f3babd6c939e2133de80cb0e17719ae0651ab4a (patch) | |
tree | 4da2f7dd71a1e72fb27c76c71f25dc5ef1882aa9 | |
parent | 175409e0f4d3b619895b6339971543d28a14d1e1 (diff) | |
download | mailman2-4f3babd6c939e2133de80cb0e17719ae0651ab4a.tar.gz mailman2-4f3babd6c939e2133de80cb0e17719ae0651ab4a.tar.xz mailman2-4f3babd6c939e2133de80cb0e17719ae0651ab4a.zip |
[ 874764 ] -admin address is now equiv to -bounce
-rw-r--r-- | Mailman/Cgi/create.py | 6 | ||||
-rwxr-xr-x | bin/newlist | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Mailman/Cgi/create.py b/Mailman/Cgi/create.py index 03c313bc..09e4790c 100644 --- a/Mailman/Cgi/create.py +++ b/Mailman/Cgi/create.py @@ -227,7 +227,7 @@ def process_request(doc, cgidata): # And send the notice to the list owner. if notify: - siteadmin = Utils.get_site_email(mlist.host_name, 'admin') + siteowner = Utils.get_site_email(mlist.host_name, 'owner') text = Utils.maketext( 'newlist.txt', {'listname' : listname, @@ -235,10 +235,10 @@ def process_request(doc, cgidata): 'admin_url' : mlist.GetScriptURL('admin', absolute=1), 'listinfo_url': mlist.GetScriptURL('listinfo', absolute=1), 'requestaddr' : mlist.GetRequestEmail(), - 'siteowner' : siteadmin, + 'siteowner' : siteowner, }, mlist=mlist) msg = Message.UserNotification( - owner, siteadmin, + owner, siteowner, _('Your new mailing list: %(listname)s'), text, mlist.preferred_language) msg.send(mlist) diff --git a/bin/newlist b/bin/newlist index 2e16a934..d3b46996 100755 --- a/bin/newlist +++ b/bin/newlist @@ -189,7 +189,7 @@ def main(): if not quiet: print _('Hit enter to notify %(listname)s owner...'), sys.stdin.readline() - siteadmin = Utils.get_site_email(mlist.host_name, 'admin') + siteowner = Utils.get_site_email(mlist.host_name, 'owner') text = Utils.maketext( 'newlist.txt', {'listname' : listname, @@ -197,7 +197,7 @@ def main(): 'admin_url' : mlist.GetScriptURL('admin', absolute=1), 'listinfo_url': mlist.GetScriptURL('listinfo', absolute=1), 'requestaddr' : mlist.GetRequestEmail(), - 'siteowner' : siteadmin, + 'siteowner' : siteowner, }, mlist=mlist) # Set the I18N language to the list's preferred language so the header # will match the template language. Stashing and restoring the old @@ -206,7 +206,7 @@ def main(): i18n.set_language(mlist.preferred_language) try: msg = Message.UserNotification( - owner_mail, siteadmin, + owner_mail, siteowner, _('Your new mailing list: %(listname)s'), text, mlist.preferred_language) msg.send(mlist) |