diff --git a/frontend/templates/notification/pledge_charged/full.txt b/frontend/templates/notification/pledge_charged/full.txt index 39d17af7..426aae47 100644 --- a/frontend/templates/notification/pledge_charged/full.txt +++ b/frontend/templates/notification/pledge_charged/full.txt @@ -1,6 +1,6 @@ {% 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 }} is charging your credit card. +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 }}. Pledge Summary Amount pledged: ${{ transaction.amount|intcomma }} @@ -8,7 +8,7 @@ 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. -If you'd like to visit the project page, click here: +If you'd like to visit the campaign page, click here: https://{{ site.domain }}{% url work transaction.campaign.work.id %} Thank you again for your support. diff --git a/frontend/templates/notification/pledge_charged/notice.html b/frontend/templates/notification/pledge_charged/notice.html index 1b1cf76f..07e6ae28 100644 --- a/frontend/templates/notification/pledge_charged/notice.html +++ b/frontend/templates/notification/pledge_charged/notice.html @@ -6,7 +6,7 @@ {% endblock %} {% block comments_graphical %} - Hooray! The campaign for {{ transaction.campaign.work.title }} has succeeded. Your credit card is being charged ${{ transaction.amount }}. Thank you again for your help. + Hooray! The campaign for {{ transaction.campaign.work.title }} has succeeded. Your credit card is being charged ${{ transaction.amount }}. Thank you again for your help. {% endblock %} {% block comments_textual %} @@ -14,13 +14,13 @@

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 now charge your credit card.

-

Pledge Summary :
- Amount pledged: {{ amount|intcomma }}
+

Pledge Summary
+ Amount pledged: {{ transaction.amount|intcomma }}
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.

-

For more information, visit the visit the project page. +

For more information, visit the visit the campaign page.

Thank you again for your support. diff --git a/frontend/templates/notification/pledge_status_change/full.txt b/frontend/templates/notification/pledge_status_change/full.txt index 5e50c093..c49730a8 100644 --- a/frontend/templates/notification/pledge_status_change/full.txt +++ b/frontend/templates/notification/pledge_status_change/full.txt @@ -10,7 +10,7 @@ Amount pledged: ${{ transaction.amount|intcomma }} Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}{% endif %} {% if transaction.host|lower == 'amazon' %}{% if up_or_down == 'increased' %} -You will also receive an email from Amazon confirming this. +You will also receive an email from Amazon confirming that you've canceled your original pledge and authorized this one. {% else %}{% if up_or_down == '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 %} diff --git a/frontend/templates/notification/pledge_status_change/notice.html b/frontend/templates/notification/pledge_status_change/notice.html index fe1be75b..71836dfc 100644 --- a/frontend/templates/notification/pledge_status_change/notice.html +++ b/frontend/templates/notification/pledge_status_change/notice.html @@ -5,22 +5,19 @@ cover image for {{ transaction.campaign.work.title }} {% endblock %} -{% block comments_book %} +{% block comments_graphical %} Your pledge for the campaign to unglue {{ transaction.campaign.work.title }} has been {% if up_or_down == 'canceled'%}canceled{% else %}modified{% endif %}. {% endblock %} -{% if up_or_down == 'canceled' %} - {% block comments_book %} - Your canceled pledge was as follows:
- Amount: ${{ transaction.amount|intcomma }}
- Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}
- {% endblock %} - -{% else %} - {% block comments_book %} - Your new pledge is as follows:
- Amount: ${{ transaction.amount|intcomma }}
- Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}
- Thank you for your continued support of {{ transaction.campaign.work.title }}. - {% endblock %} -{% endif %} \ No newline at end of file +{% block comments_textual %} + {% if up_or_down == 'canceled' %} + Your canceled pledge was as follows:
+ Amount: ${{ transaction.amount|intcomma }}
+ Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}
+ {% else %} + Your new pledge is as follows:
+ Amount: ${{ transaction.amount|intcomma }}
+ Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}
+ Thank you for your continued support of {{ transaction.campaign.work.title }}. + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/wishlist_official_comment/notice.html b/frontend/templates/notification/wishlist_official_comment/notice.html index a899c697..619a3b71 100644 --- a/frontend/templates/notification/wishlist_official_comment/notice.html +++ b/frontend/templates/notification/wishlist_official_comment/notice.html @@ -5,7 +5,7 @@ {% endblock %} {% block comments_graphical %} - {{ comment.user.username }} has made an official comment on {{ comment.content_object.title }} + {{ comment.user.username }} has made an official comment on {{ comment.content_object.title }} {% endblock %} {% block comments_textual %} diff --git a/frontend/templates/notification/wishlist_successful/notice.html b/frontend/templates/notification/wishlist_successful/notice.html index be08ee8f..89c1cd1a 100644 --- a/frontend/templates/notification/wishlist_successful/notice.html +++ b/frontend/templates/notification/wishlist_successful/notice.html @@ -5,7 +5,7 @@ {% endblock %} {% block comments_graphical %} - Hooray! We're going to give {{ campaign.work.title }} to the world! + Hooray! We're going to give {{ campaign.work.title }} to the world! {% endblock %} {% block comments_textual %} diff --git a/frontend/templates/notification/wishlist_unsuccessful/notice.html b/frontend/templates/notification/wishlist_unsuccessful/notice.html index 5b2bc25d..12abf171 100644 --- a/frontend/templates/notification/wishlist_unsuccessful/notice.html +++ b/frontend/templates/notification/wishlist_unsuccessful/notice.html @@ -5,7 +5,7 @@ {% endblock %} {% block comments_graphical %} - Alas. The campaign to unglue {{ campaign.work.title }} did not succeed. + Alas. The campaign to unglue {{ campaign.work.title }} did not succeed. {% endblock %} {% block comments_textual %}