From 5d37a969bdc9cf6e036b94ae4862c1949137a771 Mon Sep 17 00:00:00 2001
From: Andromeda Yelton <andromeda.yelton@gmail.com>
Date: Tue, 29 May 2012 08:55:16 -0400
Subject: [PATCH] phrasing needs to be sensitive to increase vs decrease

---
 .../pledge_status_change/full.txt             | 24 ++++++++++++++-----
 .../pledge_status_change/notice.html          |  9 +++----
 .../pledge_status_change/short.txt            |  2 +-
 .../pledge_you_have_pledged/full.txt          |  5 +---
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/frontend/templates/notification/pledge_status_change/full.txt b/frontend/templates/notification/pledge_status_change/full.txt
index b4e40dd8..4b6eaa01 100644
--- a/frontend/templates/notification/pledge_status_change/full.txt
+++ b/frontend/templates/notification/pledge_status_change/full.txt
@@ -1,14 +1,26 @@
-{% load humanize %}You have modified a pledge that you had previously made to the campaign to unglue {{ campaign.work.title }}
+{% load humanize %}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: {{ amount|intcomma }}
-Premium: {{ premium }}
+Amount pledged: ${{ transaction.amount|intcomma }}
+Premium: {{ transaction.premium.description }}
 
-If you increased your earlier pledge (thanks!), you will also be receiving an email from Amazon confirming this.  If you decreased an earlier pledge, you will not receive a confirmation email from Amazon.  If you log in to your Amazon Payments account you will still see an authorization to Unglue.it for the entire amount of your earlier pledge, but never fear -- we'll only charge the amount of your new pledge, not the full authorization.
+{% if payment_processor == 'amazon' %}{% if status == 'increased' %}
+You will also receive an email from Amazon confirming this.
+{% else %}{% if status == 'decreased' %}
+Your Amazon Payments account may still show an authorization to Unglue.it for the entire amount of your earlier pledge, but never fear -- if the campaign succeeds, we'll only charge you ${{ transaction.amount|intcomma }}.
+{% endif %}{% endif %}{% else %}{% endif %}
 
 If you'd like to visit the project page, click here: 
-https://{{site.domain}}{% url work work.id %}
+https://{{site.domain}}{% url work transaction.campaign.work.id %}
 
 Thank you again for your support.
 
-{{ campaign.rightsholder }} (rights holder for {{ campaign.work.title }}) and the Unglue.it team
\ No newline at end of file
+{{ transaction.campaign.rightsholder }} (rights holder for {{ transaction.campaign.work.title }}) and the Unglue.it team
+
+{% comment %}
+If we're going to send notifications in the event of an incomplete transaction, fill in another if (or the rest of the if). In the meantime, testing for 'decreased' specifically rather than !'increased' in order to allow for that.
+
+If we get Paypal running, we're going to need to figure out what notifications they send in the various pledge change events and make the communication to users consistent with that.
+
+Space has been left in the if statements for these contingencies.
+{% endcomment %}
\ No newline at end of file
diff --git a/frontend/templates/notification/pledge_status_change/notice.html b/frontend/templates/notification/pledge_status_change/notice.html
index 392010f4..26f1127c 100644
--- a/frontend/templates/notification/pledge_status_change/notice.html
+++ b/frontend/templates/notification/pledge_status_change/notice.html
@@ -1,8 +1,9 @@
-{% with campaign.work.title as title %}
+{% load humanize %}
+{% with transaction.campaign.work.title as title %}
 <div class="comments clearfix">
 	<div class="comments_info clearfix">
 		<div class="comments_book">
-			<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ title }}" /></a>
+			<a href="{% url work transaction.campaign.work.id %}"><img src="{{ transaction.campaign.work.cover_image_small }}" alt="cover image for {{ title }}" /></a>
 		</div>
 		<div class="comments_graphical">
 			Your pledge for the campaign to unglue {{ title }} has been modified.
@@ -11,8 +12,8 @@
 	
 	<div class="comments_textual">
 		Your new pledge is as follows:<br />
-		Amount: ${{ amount }}<br />
-		Premium: {{ premium.description }}<br />
+		Amount: ${{ transaction.amount|intcomma }}<br />
+		Premium: {{ transaction.premium.description }}<br />
 		Thank you for your continued support of {{ title }}.
 	</div>
 </div>
diff --git a/frontend/templates/notification/pledge_status_change/short.txt b/frontend/templates/notification/pledge_status_change/short.txt
index d031a337..28d8360d 100644
--- a/frontend/templates/notification/pledge_status_change/short.txt
+++ b/frontend/templates/notification/pledge_status_change/short.txt
@@ -1 +1 @@
-Your pledge has been modified for {{ work.title}}
\ No newline at end of file
+Your pledge has been modified for {{ transaction.campaign.work.title}}
\ No newline at end of file
diff --git a/frontend/templates/notification/pledge_you_have_pledged/full.txt b/frontend/templates/notification/pledge_you_have_pledged/full.txt
index 96770b88..21e37902 100644
--- a/frontend/templates/notification/pledge_you_have_pledged/full.txt
+++ b/frontend/templates/notification/pledge_you_have_pledged/full.txt
@@ -1,7 +1,4 @@
-{% load humanize %}
-{% with work.title as title %}
-{% with site.domain as domain %}
-{% with work.id as work_id %}
+{% load humanize %}{% with work.title as title %}{% with site.domain as domain %}{% with work.id as work_id %}
 Thank you, {{ transaction.user.username }}!  You have pledged to unglue {{ title }}.  If this campaign successfully raises ${{ campaign.target|intcomma }} by {{ campaign.deadline|date:"M d Y" }}, this book will be released in an unglued ebook edition for all to enjoy.
 
 Pledge summary