Fix email address in comment

diff --git a/pgcommitfest/auth.py b/pgcommitfest/auth.py
index 769ebab8309ab791d13320a164af10a6a21e080c..b17efd8b69a841a15282a1661664ea84eda6c6f2 100644 (file)
--- a/pgcommitfest/auth.py
+++ b/pgcommitfest/auth.py
@@ -130,7 +130,7 @@ def auth_receive(request):
 a different username than %s.
 
 This is almost certainly caused by some legacy data in our database.
-Please send an email to webmaster@postgresql.eu, indicating the username
+Please send an email to webmaster@postgresql.org, indicating the username
 and email address from above, and we'll manually marge the two accounts
 for you.
 

diff --git a/pgcommitfest/mailqueue/util.py b/pgcommitfest/mailqueue/util.py
index 38e114538ad115bfdafb77bfb59c0c6e7828a4a9..525f0687ae3dbd7a88894d8d6c3e69141e82318f 100644 (file)
--- a/pgcommitfest/mailqueue/util.py
+++ b/pgcommitfest/mailqueue/util.py
@@ -39,7 +39,7 @@ def send_mail(sender, receiver, fullmsg):
        # Send an email, prepared as the full MIME encoded mail already
        QueuedMail(sender=sender, receiver=receiver, fullmsg=fullmsg).save()
 
-def send_template_mail(sender, receiver, subject, templatename, templateattr={}, usergenerated=False):
+def send_template_mail(sender, senderaccountname, receiver, subject, templatename, templateattr={}, usergenerated=False):
        send_simple_mail(sender, receiver, subject,
                                         get_template(templatename).render(Context(templateattr)),
-                                        '__internal')
+                                        senderaccountname)

diff --git a/pgcommitfest/userprofile/views.py b/pgcommitfest/userprofile/views.py
index 0d19a4fbfbe855d508c93bb328a89f70abdbb2b7..6b7499d3421da5193d4b4f2847264394513925ec 100644 (file)
--- a/pgcommitfest/userprofile/views.py
+++ b/pgcommitfest/userprofile/views.py
@@ -37,6 +37,7 @@ def userprofile(request):
                                                                   tokensent=datetime.now())
                                m.save()
                                send_template_mail(settings.NOTIFICATION_FROM,
+                                                                  request.user.username,
                                                                   m.email,
                                                                   'Your email address for commitfest.postgresql.org',
                                                                   'extra_email_mail.txt',