# HG changeset patch
# User Madhusudan.C.S <madhusudancs@gmail.com>
# Date 1257933526 -19800
# Node ID 2294c71a61ead3f9f328c7246dbf5f74d585ae17
# Parent  127b772a3af4e3d205132dbbf0f90efed1abc5e5
Made final changes to the mail to be sent.

diff -r 127b772a3af4 -r 2294c71a61ea project/settings.py
--- a/project/settings.py	Wed Nov 11 12:55:39 2009 +0530
+++ b/project/settings.py	Wed Nov 11 15:28:46 2009 +0530
@@ -74,3 +74,5 @@
         'django.core.context_processors.i18n',
         'django.core.context_processors.media',
         'project.kiwipycon.context_processors.sponsors')
+
+DEFAULT_FROM_EMAIL = 'admin@scip.in'
\ No newline at end of file
diff -r 127b772a3af4 -r 2294c71a61ea project/templates/notifications/activate_mail.html
--- a/project/templates/notifications/activate_mail.html	Wed Nov 11 12:55:39 2009 +0530
+++ b/project/templates/notifications/activate_mail.html	Wed Nov 11 15:28:46 2009 +0530
@@ -1,18 +1,18 @@
 Hello everyone,
-  We have not activated your account till now since were still in the
-process of finalizing the ideas for SciPy.in 2009 and the smoothing out
-the organization details. This mail describes the steps to complete the
-registration process for SciPy.in. Click on the activation link below to
-activate your account. Also please note the registration process is not
-complete by just activating your account. Read further below for
-completing the registration process.
+  There has been a delay in activating your account since we were still
+smoothening the organization details for SciPy.in 2009. Apologies for
+this. This mail describes the steps to complete the registration process
+for SciPy.in. Click on the activation link below to activate your account.
+Also, please note that the activation of your account is simply the
+first step of the registration process. Read further below for completing
+the registration process.
 
 http://scipy.in/accounts/activate/{{ activation_key }}/
 
   If your email client doesn't support clicking the links, please copy
 paste the above URL in your browser's address bar. If your email client
 wraps the line and the activation URL is broken, then your activation
-can be constructed as follows:
+link can be constructed as follows:
 
 http://scipy.in/accounts/activate/<your-activation-key>/
 
@@ -23,20 +23,20 @@
 November 18th, 2009. Otherwise your account will be removed from
 our database.
 
-There is a registration fee of Rs.200 for the conference. But there is
-no registration fee for tutorials and sprint. The registration fee for
-the conference can be paid at the venue at the registration desk at
-the venue on the day of conference.
+Also, please note that there is a registration fee of Rs.200 for the
+conference. But there is no registration fee for tutorials and sprint.
+The registration fee for the conference can be paid at the registration
+desk at the venue on the day of conference.
 
 Very important: Please login and click on the registration link on the
-left panel again. You will be presented with other details. Please fill
-in the relevant details. This information is very much required for us
-to conduct SciPy very smoothly. 
+left panel again. You will be requested for other details. Please fill
+in the relevant details. This information is required for us to conduct
+SciPy smoothly.
 
-Optionally you can also click on Edit Profile link at the top and fill in
-your bio.
+Optionally you can also click on "Edit Profile" link at the top and fill
+in your bio.
 
 
 --
- Thanks for understanding,
+ Thanks,
  SciPy Team
diff -r 127b772a3af4 -r 2294c71a61ea scripts/scipy_migrate.py
--- a/scripts/scipy_migrate.py	Wed Nov 11 12:55:39 2009 +0530
+++ b/scripts/scipy_migrate.py	Wed Nov 11 15:28:46 2009 +0530
@@ -25,8 +25,9 @@
 
     for reg in regs:
 
-        subject = "Update and activate your SciPy.in registration."
+        subject = 'Update and activate your SciPy.in registration.'
         message = loader.render_to_string(
             template, dictionary={'activation_key': reg.activation_key})
 
-        reg.user.email_user(subject=subject, message=message)
+        reg.user.email_user(subject=subject, message=message,
+                            from_email='admin@scipy.in')