changeset 2352:0b2420a9b14d

Merge devel.
author Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl>
date Tue, 10 Jul 2007 17:58:28 +0200
parents 7dd064111811 (current diff) 2b4ae7c40bfa (diff)
children 91b9d9e40e07
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/events/emailnotify.py	Tue Jul 10 17:56:54 2007 +0200
+++ b/MoinMoin/events/emailnotify.py	Tue Jul 10 17:58:28 2007 +0200
@@ -104,9 +104,9 @@
     body = _("""Dear Superuser, a new user has just been created. Details follow:
     
     User name: %(username)s
-    Email address: %(useremail)s)""") % {
+    Email address: %(useremail)s""", formatted=False) % {
          'username': event.user.name,
-         'useremail': email
+         'useremail': email,
          }
 
     from_address = cfg.mail_from
--- a/jabberbot/xmlrpcbot.py	Tue Jul 10 17:56:54 2007 +0200
+++ b/jabberbot/xmlrpcbot.py	Tue Jul 10 17:58:28 2007 +0200
@@ -114,7 +114,7 @@
         msg = u"""Credentials check failed, you may be unable to see all information."""
         warning = cmd.NotificationCommand([jid], msg)
         self.commands_out.put_nowait(warning)
-        
+
     def get_page(self, command):
         """Returns a raw page"""