Merge pull request #56 from Gluejar/proof_notifications

Proof notifications

frontend/templates/notification/pledge_charged/full.txt

@@ -1,10 +1,9 @@
 {% load humanize %}Congratulations!
 
-Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. {{ transaction.host|capfirst }} will charge your credit card ${{ transaction.amount|intcomma }}.
+Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. Your credit card will be charged ${{ transaction.amount|intcomma }}.
 
-Pledge Summary 
+Pledge summary 
-Amount pledged: ${{ transaction.amount|intcomma }}
+{% include "notification/pledge_summary.txt" %}    
-Premium: {{ transaction.premium.description }} 
 
 We will notify you when the unglued ebook is available for you to read.  If you've requested special premiums, the rights holder, {{ transaction.campaign.rightsholder }}, will be in touch with you via email to request any information needed to deliver your premium.
 

frontend/templates/notification/pledge_status_change/full.txt

@@ -2,20 +2,13 @@
 
 Your canceled pledge
 Amount: ${{ transaction.amount|intcomma }}
-Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}
+Premium: {{ transaction.premium.description }}
+You will not be acknowledged in the unglued ebook.
 {% else %}You have modified a pledge that you had previously made to the campaign to unglue {{ transaction.campaign.work.title }}.
 
 Your new pledge summary
-Amount pledged: ${{ transaction.amount|intcomma }}
+{% include "notification/pledge_summary.txt" %}    
-Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}{% endif %}
+{% endif %}
-
-Acknowledgements: 
-- The unglued ebook will be delivered to your inbox.</li>{% if not transaction.anonymous %}{% ifequal transaction.tier 1  %}
-- You will be listed as a Supporter using the name "{{ transaction.ack_name }}".{% endifequal %}{% ifequal transaction.tier 2  %}
-- You will be listed as a Benefactor using the name "{{ transaction.ack_name }}" with a link to your Unglue.it supporter page.{% endifequal %}{% ifequal transaction.tier 3  %}
-- You will be listed as a Bibliophile using the name "{{ transaction.ack_name }}" with a link to your Unglue.it supporter page.{% endifequal %}{% endif %}{% if transaction.ack_dedication %}
-- The following dedication will be included: 
-    {{ transaction.ack_dedication }}{% endif %}
 
 If you'd like to visit the campaign page or make changes, click here: 
 https://{{site.domain}}{% url work transaction.campaign.work.id %}

frontend/templates/notification/pledge_summary.txt

@@ -0,0 +1,13 @@
+{% load humanize %}
+Amount pledged: ${{ transaction.amount|intcomma }}
+Premium: {{ transaction.premium.description }}
+
+You will also be acknowledged as follows:
+- The unglued ebook will be delivered to your inbox.{% if not transaction.anonymous %}{% ifequal transaction.tier 1  %}
+- You will be listed in the ebook as a Supporter using the name "{{ transaction.ack_name }}".{% endifequal %}{% ifequal transaction.tier 2  %}
+- You will be listed in the ebook as a Benefactor using the name "{{ transaction.ack_name }}" with a link to your Unglue.it supporter page.{% endifequal %}{% ifequal transaction.tier 3 %}
+- You will be listed in the ebook as a Bibliophile using the name "{{ transaction.ack_name }}" with a link to your Unglue.it supporter page.{% endifequal %}{% endif %}{% ifequal transaction.tier 3 %}{% if transaction.ack_dedication %}
+- The following dedication will be included in the ebook: 
+    {{ transaction.ack_dedication }}{% else %}
+- You were eligible to include a dedication in the unglued ebook, but did not choose to do so.  If you like, you can change this at https://{{ site.domain }}{% url pledge_modify work_id=transaction.campaign.work.id %}.
+{% endif %}{% endifequal %}

frontend/templates/notification/pledge_you_have_pledged/full.txt

@@ -2,16 +2,7 @@
 Thank you, {{ transaction.user.username }}!  You have pledged to unglue {{ transaction.campaign.work.title }}.  If this campaign successfully raises ${{ transaction.campaign.target|intcomma }} by {{ transaction.campaign.deadline|date:"M d Y" }}, this book will be released in an unglued ebook edition for all to enjoy.
 
 Pledge summary
-Amount pledged: ${{ transaction.amount|intcomma }}
+{% include "notification/pledge_summary.txt" %}    
-Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}
-
-Acknowledgements: 
-- The unglued ebook will be delivered to your inbox.</li>{% if not transaction.anonymous %}{% ifequal transaction.tier 1  %}
-- You will be listed as a Supporter using the name "{{ transaction.ack_name }}".{% endifequal %}{% ifequal transaction.tier 2  %}
-- You will be listed as a Benefactor using the name "{{ transaction.ack_name }}" with a link to your Unglue.it supporter page.{% endifequal %}{% ifequal transaction.tier 3  %}
-- You will be listed as a Bibliophile using the name "{{ transaction.ack_name }}" with a link to your Unglue.it supporter page.{% endifequal %}{% endif %}{% if transaction.ack_dedication %}
-- The following dedication will be included: 
-    {{ transaction.ack_dedication }}{% endif %}
 
 You can help even more by sharing this campaign with your friends.
 

frontend/templates/pledge_complete.html

@@ -52,7 +52,7 @@
 		{% endifequal %}
 	{% endif %}
 	{% if transaction.ack_dedication %}
-	    <li>The following dedication will be included: <i>{{ transaction.ack_dedication }}</i>.</li>
+	    <li>The following dedication will be included: <i>{{ transaction.ack_dedication }}</i></li>
 	{% endif %}
 		</ul>
 		</div>