Better settings with django-templated-email 0.4.2.

joshuakarjala · Apr 15, 2012 · d6e484d · d6e484d
1 parent 2a25ac6
commit d6e484d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/README.rst b/README.rst
@@ -61,8 +61,8 @@ example setting such as::
 
 And create the following templates::
 
-   <project_dir>/templates/templated_email/beta/beta_confirm.email
-   <project_dir>/templates/templated_email/beta/beta_invite.email
+   <project_dir>/templates/beta/beta_confirm.email
+   <project_dir>/templates/beta/beta_invite.email
 
 
 Integration with django_social_auth

diff --git a/hunger/email.py b/hunger/email.py
@@ -21,7 +21,8 @@ def beta_confirm(email, **kwargs):
     context_dict = kwargs.copy()
     if templated_email_available:
         send_templated_mail(
-            template_name=os.path.join(templates_folder, 'beta_confirm'),
+            template_dir=templates_folder,
+            template_name='beta_confirm',
             from_email=from_email,
             recipient_list=[email],
             context=context_dict,
@@ -52,7 +53,8 @@ def beta_invite(email, code, **kwargs):
 
     if templated_email_available:
         send_templated_mail(
-            template_name=os.path.join(templates_folder, 'beta_invite'),
+            template_dir=templates_folder,
+            template_name='beta_invite',
             from_email=from_email,
             recipient_list=[email],
             context=context_dict,

diff --git a/...templated_email/hunger/beta_confirm.email → hunger/templates/hunger/beta_confirm.email b/...templated_email/hunger/beta_confirm.email → hunger/templates/hunger/beta_confirm.email
diff --git a/.../templated_email/hunger/beta_invite.email → hunger/templates/hunger/beta_invite.email b/.../templated_email/hunger/beta_invite.email → hunger/templates/hunger/beta_invite.email