# HG changeset patch
# User Administrator <>
# Date 1265560079 -3600
# Node ID 3391d823d6f84fcd3e004a2c43f5cc539abdcd3c
# Parent  660b7d2d77edf0f39faaca48a39e3007dbfe4f0c
Make email subjects consistent for every kind of notification

diff -r 660b7d2d77ed -r 3391d823d6f8 MoinMoin/events/notification.py
--- a/MoinMoin/events/notification.py	Sun Feb 07 17:43:14 2010 +0300
+++ b/MoinMoin/events/notification.py	Sun Feb 07 17:27:59 2010 +0100
@@ -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,
                 }