Author: leidel
Date: Mon Sep 8 10:00:35 2008
New Revision: 36
Modified:
trunk/devproject/emailconfirmation/models.py
trunk/devproject/templates/emailconfirmation/email_confirmation_message.txt
trunk/devproject/templates/emailconfirmation/email_confirmation_subject.txt
Log:
passes now a Site object to the email templates; marked default templates
for i18n;
Modified: trunk/devproject/emailconfirmation/models.py
==============================================================================
--- trunk/devproject/emailconfirmation/models.py (original)
+++ trunk/devproject/emailconfirmation/models.py Mon Sep 8 10:00:35 2008
@@ -91,16 +91,19 @@
def send_confirmation(self, email_address):
salt = sha.new(str(random())).hexdigest()[:5]
confirmation_key = sha.new(salt + email_address.email).hexdigest()
+ current_site = Site.objects.get_current()
activate_url = u"http://%s%s"; % (
- unicode(Site.objects.get_current()),
+ unicode(current_site.domain),
reverse("emailconfirmation.views.confirm_email",
args=(confirmation_key,))
)
-
- subject =
render_to_string("emailconfirmation/email_confirmation_subject.txt")
- message =
render_to_string("emailconfirmation/email_confirmation_message.txt", {
+ context = {
"user": email_address.user,
"activate_url": activate_url,
- })
+ "current_site": current_site,
+ "confirmation_key": confirmation_key,
+ }
+ subject =
render_to_string("emailconfirmation/email_confirmation_subject.txt",
context)
+ message =
render_to_string("emailconfirmation/email_confirmation_message.txt",
context)
send_mail(subject, message, settings.DEFAULT_FROM_EMAIL,
[email_address.email])
return self.create(email_address=email_address,
sent=datetime.now(), confirmation_key=confirmation_key)
Modified:
trunk/devproject/templates/emailconfirmation/email_confirmation_message.txt
==============================================================================
---
trunk/devproject/templates/emailconfirmation/email_confirmation_message.txt
(original)
+++
trunk/devproject/templates/emailconfirmation/email_confirmation_message.txt
Mon Sep 8 10:00:35 2008
@@ -1,3 +1,4 @@
-User '{{ user }}' at django-email-confirmation has given this as an email
address.
+{% load i18n %}{% blocktrans with current_site.name as
site_name %}User '{{ user }}' at {{ site_name }} has given this as an email
address.
-To confirm this is correct, go to http://localhost:8001/confirm_email/{{
confirmation_key }}/
+To confirm this is correct, go to {{ activate_url }}
+{% endblocktrans %}
\ No newline at end of file
Modified:
trunk/devproject/templates/emailconfirmation/email_confirmation_subject.txt
==============================================================================
---
trunk/devproject/templates/emailconfirmation/email_confirmation_subject.txt
(original)
+++
trunk/devproject/templates/emailconfirmation/email_confirmation_subject.txt
Mon Sep 8 10:00:35 2008
@@ -1 +1 @@
-Confirm email address for django-email-confirmation
\ No newline at end of file
+{% load i18n %}{% blocktrans with current_site.name as site_name %}Confirm
email address for {{ site_name }}{% endblocktrans %}
\ No newline at end of file
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
