# HG changeset patch
# User Madhusudan.C.S <madhusudancs@gmail.com>
# Date 1257933968 -19800
# Node ID 3cb3f853a193a194e408179d042a56e03f90ec1a
# Parent  2294c71a61ead3f9f328c7246dbf5f74d585ae17
Moved ACCOUNT_ACTIVATION_DAYS to settings.py and added name as a template variable.

diff -r 2294c71a61ea -r 3cb3f853a193 project/production.py
--- a/project/production.py	Wed Nov 11 15:28:46 2009 +0530
+++ b/project/production.py	Wed Nov 11 15:36:08 2009 +0530
@@ -29,8 +29,6 @@
     'registration',
 )
 
-ACCOUNT_ACTIVATION_DAYS = 55
-
 DATABASE_ENGINE = 'mysql'
 DATABASE_NAME = 'conference2009'
 DATABASE_USER = 'root'
diff -r 2294c71a61ea -r 3cb3f853a193 project/settings.py
--- a/project/settings.py	Wed Nov 11 15:28:46 2009 +0530
+++ b/project/settings.py	Wed Nov 11 15:36:08 2009 +0530
@@ -75,4 +75,6 @@
         'django.core.context_processors.media',
         'project.kiwipycon.context_processors.sponsors')
 
-DEFAULT_FROM_EMAIL = 'admin@scip.in'
\ No newline at end of file
+DEFAULT_FROM_EMAIL = 'admin@scip.in'
+
+ACCOUNT_ACTIVATION_DAYS = 55
\ No newline at end of file
diff -r 2294c71a61ea -r 3cb3f853a193 project/templates/notifications/activate_mail.html
--- a/project/templates/notifications/activate_mail.html	Wed Nov 11 15:28:46 2009 +0530
+++ b/project/templates/notifications/activate_mail.html	Wed Nov 11 15:36:08 2009 +0530
@@ -1,4 +1,4 @@
-Hello everyone,
+Hello {{ name }},
   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
diff -r 2294c71a61ea -r 3cb3f853a193 scripts/scipy_migrate.py
--- a/scripts/scipy_migrate.py	Wed Nov 11 15:28:46 2009 +0530
+++ b/scripts/scipy_migrate.py	Wed Nov 11 15:36:08 2009 +0530
@@ -27,7 +27,8 @@
 
         subject = 'Update and activate your SciPy.in registration.'
         message = loader.render_to_string(
-            template, dictionary={'activation_key': reg.activation_key})
+            template, dictionary={'activation_key': reg.activation_key,
+                                  'name': reg.user.username})
 
         reg.user.email_user(subject=subject, message=message,
                             from_email='admin@scipy.in')