adding support for focusing answers when linking to them

[osqa.git] / forum / skins / default / templates / notifications / base_text.html

diff --git a/forum/skins/default/templates/notifications/base_text.html b/forum/skins/default/templates/notifications/base_text.html
index ded1e973c36380c801fbc7da4c0d70cfc972e983..ed2ebdf70daf10953de39f4866de37d37a982621 100644 (file)
--- a/forum/skins/default/templates/notifications/base_text.html
+++ b/forum/skins/default/templates/notifications/base_text.html
@@ -1,18 +1,17 @@
 {% load extra_filters extra_tags i18n email_tags %}
 
 {% load extra_filters extra_tags i18n email_tags %}
 

-{% declare %}
-    postal_address = "DZone, Inc. 140 Preston Executive Drive, Cary NC 27513, USA"
-{% enddeclare %}
-
+{% if not exclude_greeting %}

 {% trans "Hello" %} {{ recipient.username }},
 {% trans "Hello" %} {{ recipient.username }},

+{% endif %}

 
 

-{% block content %}
-{% endblock%}       
+{% block content %}{% endblock%}

 
 

-Thanks,
+{% trans "Thanks" %},

 {{settings.APP_SHORT_NAME}}
 
 {{settings.APP_SHORT_NAME}}
 

-P.S. You can always fine-tune which notifications you receive here:
-{{ settings.APP_URL }}{% url user_subscriptions id=recipient.id %}
+{% if not exclude_finetune %}
+{% trans "P.S. You can always fine-tune which notifications you receive here:" %}
+{{ settings.APP_URL }}{{ recipient.get_user_subscriptions_url }}
+{% endif %}

 
 

-{{ postal_address }}
\ No newline at end of file
+{{ settings.EMAIL_FOOTER_TEXT }}
\ No newline at end of file