changeset 5599:67e542fc0f81

events/notification.py: Applied patch http://moinmo.in/MoinMoinPatch/SameEmailSubjectFormatForEveryNotification . Sadly, patch author hadn't provided proper hg name and e-mail (and did edits on MoinMoin wiki anonymously), so it was overriden.
author Eugene Syromyatnikov <evgsyr@gmail.com>
date Tue, 02 Mar 2010 21:17:25 +0300
parents 8f2446858dd3
children 354356b125b4
files MoinMoin/events/notification.py
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/events/notification.py	Mon Mar 01 00:23:21 2010 +0100
+++ b/MoinMoin/events/notification.py	Tue Mar 02 21:17:25 2010 +0300
@@ -7,6 +7,8 @@
 
     @copyright: 2007 by Karol Nowak <grywacz@gmail.com>
     @license: GNU GPL, see COPYING for details.
+
+    DJ: Mail subjects were not consistent with prep_page_changed_mail in emailnotify.py
 """
 
 from MoinMoin import user, wikiutil
@@ -132,7 +134,7 @@
 
     @return: a dict containing message body and subject
     """
-    subject = _("New user account created on %(sitename)s") % {'sitename': sitename or "Wiki"}
+    subject = _("[%(sitename)s] New user account created") % {'sitename': sitename or "Wiki"}
     text = _("""Dear Superuser, a new user has just been created on "%(sitename)s". Details follow:
 
     User name: %(username)s
@@ -154,7 +156,7 @@
     """
     data = {}
 
-    data['subject'] = _("New attachment added to page %(pagename)s on %(sitename)s") % {
+    data['subject'] = _("[%(sitename)s] New attachment added to page %(pagename)s") % {
                 'pagename': page_name,
                 'sitename': request.cfg.sitename or request.url_root,
                 }
@@ -188,7 +190,7 @@
     """
     data = {}
 
-    data['subject'] = _("Removed attachment from page %(pagename)s on %(sitename)s") % {
+    data['subject'] = _("[%(sitename)s] Removed attachment from page %(pagename)s") % {
                 'pagename': page_name,
                 'sitename': request.cfg.sitename or request.url_root,
                 }