diff options
| author | Madhusudan.C.S | 2009-11-11 15:36:08 +0530 |
|---|---|---|
| committer | Madhusudan.C.S | 2009-11-11 15:36:08 +0530 |
| commit | fbb498fac2f433176813af484892d2c1c389836d (patch) | |
| tree | 4cbc9b663798d3ab6ea697f5d5aef815d2171e79 | |
| parent | 100f5168926a99ce7067c89e025766499b448664 (diff) | |
| download | scipycon-fbb498fac2f433176813af484892d2c1c389836d.tar.gz scipycon-fbb498fac2f433176813af484892d2c1c389836d.tar.bz2 scipycon-fbb498fac2f433176813af484892d2c1c389836d.zip | |
Moved ACCOUNT_ACTIVATION_DAYS to settings.py and added name as a template variable.
| -rw-r--r-- | project/production.py | 2 | ||||
| -rw-r--r-- | project/settings.py | 4 | ||||
| -rw-r--r-- | project/templates/notifications/activate_mail.html | 2 | ||||
| -rw-r--r-- | scripts/scipy_migrate.py | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/project/production.py b/project/production.py index 6a91665..1104c24 100644 --- a/project/production.py +++ b/project/production.py @@ -29,8 +29,6 @@ INSTALLED_APPS = ( 'registration', ) -ACCOUNT_ACTIVATION_DAYS = 55 - DATABASE_ENGINE = 'mysql' DATABASE_NAME = 'conference2009' DATABASE_USER = 'root' diff --git a/project/settings.py b/project/settings.py index e52c1bf..4dea6e7 100644 --- a/project/settings.py +++ b/project/settings.py @@ -75,4 +75,6 @@ TEMPLATE_CONTEXT_PROCESSORS = ( '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 --git a/project/templates/notifications/activate_mail.html b/project/templates/notifications/activate_mail.html index 53e8cde..ea4d54a 100644 --- a/project/templates/notifications/activate_mail.html +++ b/project/templates/notifications/activate_mail.html @@ -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 --git a/scripts/scipy_migrate.py b/scripts/scipy_migrate.py index 65e236e..50c115c 100644 --- a/scripts/scipy_migrate.py +++ b/scripts/scipy_migrate.py @@ -27,7 +27,8 @@ def remind_users(): 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') |