From 6b687df1705b2dddcf6d910bf53bab2eb5818f08 Mon Sep 17 00:00:00 2001
From: Charles Connell <charles@connells.org>
Date: Mon, 13 Jan 2014 23:21:07 -0500
Subject: [PATCH] Slightly nicer emails

---
 karmaworld/settings/common.py                        |  4 ++--
 .../account/email/email_confirmation_message.txt     | 11 ++++++++---
 .../account/email/email_confirmation_subject.txt     |  2 +-
 .../account/email/password_reset_key_message.txt     | 12 +++++++-----
 .../account/email/password_reset_key_subject.txt     |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/karmaworld/settings/common.py b/karmaworld/settings/common.py
index f6b2b29..fd604a5 100644
--- a/karmaworld/settings/common.py
+++ b/karmaworld/settings/common.py
@@ -262,9 +262,9 @@ AUTHENTICATION_BACKENDS = (
 
 ACCOUNT_EMAIL_REQUIRED = True
 ACCOUNT_AUTHENTICATION_METHOD = "email"
-ACCOUNT_CONFIRM_EMAIL_ON_GET = True
+ACCOUNT_CONFIRM_EMAIL_ON_GET = False
 ACCOUNT_EMAIL_VERIFICATION = "optional"
-ACCOUNT_EMAIL_SUBJECT_PREFIX = "KarmaNotes.org"
+ACCOUNT_EMAIL_SUBJECT_PREFIX = "KarmaNotes.org -- "
 ACCOUNT_USER_MODEL_EMAIL_FIELD = "email"
 ACCOUNT_USERNAME_REQUIRED = False
 SOCIALACCOUNT_EMAIL_REQUIRED = True
diff --git a/karmaworld/templates/account/email/email_confirmation_message.txt b/karmaworld/templates/account/email/email_confirmation_message.txt
index 50bfb87..bcd8f86 100644
--- a/karmaworld/templates/account/email/email_confirmation_message.txt
+++ b/karmaworld/templates/account/email/email_confirmation_message.txt
@@ -1,4 +1,9 @@
-{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %}{% blocktrans with current_site.name as site_name %}User {{ user_display }} at {{ site_name }} has given this as an email address.
+{% load account %}
+{% user_display user as user_display %}
+{% autoescape off %}
+Hey {{ user_display }},
 
-To confirm this is correct, go to {{ activate_url }}
-{% endblocktrans %}{% endautoescape %}
+Welcome to KarmaNotes! Please confirm your email with the link below:
+
+{{ activate_url }}
+{% endautoescape %}
diff --git a/karmaworld/templates/account/email/email_confirmation_subject.txt b/karmaworld/templates/account/email/email_confirmation_subject.txt
index 3c960da..c7d5cc7 100644
--- a/karmaworld/templates/account/email/email_confirmation_subject.txt
+++ b/karmaworld/templates/account/email/email_confirmation_subject.txt
@@ -1,4 +1,4 @@
 {% load i18n %}
 {% autoescape off %}
-{% blocktrans %}Confirm E-mail Address{% endblocktrans %}
+{% blocktrans %}Confirm your KarmaNotes e-mail{% endblocktrans %}
 {% endautoescape %}
diff --git a/karmaworld/templates/account/email/password_reset_key_message.txt b/karmaworld/templates/account/email/password_reset_key_message.txt
index 585e8b3..0349172 100644
--- a/karmaworld/templates/account/email/password_reset_key_message.txt
+++ b/karmaworld/templates/account/email/password_reset_key_message.txt
@@ -1,9 +1,11 @@
-{% load i18n %}{% blocktrans with site.domain as site_domain and user.username as username %}You're receiving this e-mail because you or someone else has requested a password for your user account at {{site_domain}}.
+{% load account %}
+{% user_display user as user_display %}
+{% autoescape off %}
+Hey {{ user_display }},
+
+You're receiving this e-mail because you (or someone else) has requested a password for your user account at KarmaNotes.
 It can be safely ignored if you did not request a password reset. Click the link below to reset your password.
 
 {{password_reset_url}}
 
-In case you forgot, your username is {{username}}.
-
-Thanks for using our site!
-{% endblocktrans %}
+{% endautoescape %}
diff --git a/karmaworld/templates/account/email/password_reset_key_subject.txt b/karmaworld/templates/account/email/password_reset_key_subject.txt
index aa80d11..67a1c59 100644
--- a/karmaworld/templates/account/email/password_reset_key_subject.txt
+++ b/karmaworld/templates/account/email/password_reset_key_subject.txt
@@ -1,4 +1,4 @@
 {% load i18n %}
 {% autoescape off %}
-{% blocktrans %}Password Reset E-mail{% endblocktrans %}
+{% blocktrans %}KarmaNotes Password Reset{% endblocktrans %}
 {% endautoescape %}
\ No newline at end of file
-- 
2.25.1