diff --git a/frontend/templates/notification/wishlist_unglued_book_released/full.txt b/frontend/templates/notification/wishlist_unglued_book_released/full.txt index a3112f78..c0ace2aa 100644 --- a/frontend/templates/notification/wishlist_unglued_book_released/full.txt +++ b/frontend/templates/notification/wishlist_unglued_book_released/full.txt @@ -2,25 +2,35 @@ Great News, {{user.username}}! {{ work.title }}, which you have supported on Unglue.it, is now available for download as an Unglued Ebook.

{% else %} -Good News! {{ work.title }} which is on your wishlist is available for download as a {{ work.ebooks.0.rights.display }} ebook. +Good News, {{user.username}}! {{ work.title }} which is on your wishlist is available for download as a {{ work.ebooks.0.get_rights_display }} ebook. {% if work.ebooks.0.user %} -We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link to +We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link(s). {% endif %} {% endif %} Here are the files available for download: {% for ebook in work.ebooks %} -File type: {{ ebook.format.display }} -License: {{ ebook.rights.display }} -Host Site: {{ ebook.provider }} +File type: {{ ebook.get_format_display }} +License: {{ ebook.get_rights_display }} +Host Site: {{ ebook.provider }} URL: {{ ebook.url }} {% endfor %} {% if work.ebooks.0.rights == 'PD-US' %} A public domain ebook belongs to all of us. You can do anything you like with it. {% else %} -The Creative Commons licensing terms for allow you to redistribute the files under the the specified license terms. There's no DRM. +The Creative Commons licensing terms for allow you to redistribute the files under the specified license terms. There's no DRM. {% endif %} +{% if work.last_campaign_status == 'SUCCESSFUL' %} +If you have any problems with this unglued ebook, please don't hesitate to let us know at support@gluejar.com. And if you love being able to give this ebook for free to all of your friends, please consider supporting other ebooks for ungluing. +{% else %} +If you have any problems with these ebook files, please don't hesitate to let us know at support@gluejar.com. For example, if the file isn't what it says it is, or if the licensing or copyright status is misrepresented, we want to know as soon as possble. +{% endif %} + +Thanks, + +Your Tireless Unglue.it Staff + Give ebooks to the world; give income to authors and publishers. Unglue.it diff --git a/frontend/templates/notification/wishlist_unglued_book_released/notice.html b/frontend/templates/notification/wishlist_unglued_book_released/notice.html index 1b2d1415..6cb3c6b4 100644 --- a/frontend/templates/notification/wishlist_unglued_book_released/notice.html +++ b/frontend/templates/notification/wishlist_unglued_book_released/notice.html @@ -1,12 +1,12 @@ {% load truncatechars %}
- cover image for {{ work.title }} + cover image for {{ work.title }}
- + {{ work.title }} is now available for download
{% if work.last_campaign_status == 'SUCCESSFUL' %} @@ -14,14 +14,16 @@ Great News! {{ work.title }} which you have supported is now available for download as an Unglued Ebook.

{% else %} -Good News! {{ work.title }} which is on your wishlist is available for download as a {{ work.ebooks.0.rights.display }} ebook. - +

+Good News! {{ work.title }} which is on your wishlist is available for download as a {{ work.ebooks.0.get_rights_display }} ebook. +

{% if work.ebooks.0.user %} -We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link to - +

+We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link(s). +

{% endif %} {% endif %} -Here are the files available for download: +

Here are the files available for download:

@@ -31,20 +33,36 @@ Here are the files available for download: {% for ebook in work.ebooks %} - - + + - + {% endfor %}
File type
{{ ebook.format.display }}{{ ebook.rights.display }}{{ ebook.get_format_display }}{{ ebook.get_rights_display }} {{ ebook.provider }}{{ ebook.url|truncatechars:20 }}{{ ebook.url|truncatechars:30 }}
+ +

{% if work.ebooks.0.rights == 'PD-US' %} A public domain ebook belongs to all of us. You can do anything you like with it. {% else %} -The Creative Commons licensing terms for allow you to redistribute the files under the the specified license terms. There's no DRM. +The Creative Commons licensing terms for the ebook allow you to redistribute the files under the specified license terms. There's no DRM. {% endif %} +

+

+{% if work.last_campaign_status == 'SUCCESSFUL' %} +If you have any problems with this unglued ebook, please don't hesitate to let us know at support@gluejar.com. And if you love being able to give this ebook for free to all of your friends, please consider supporting other ebooks for ungluing. +{% else %} +If you have any problems with these ebook files, please don't hesitate to let us know at support@gluejar.com. For example, if the file isn't what it says it is, or if the licensing or copyright status is misrepresented, we want to know as soon as possble. +{% endif %} +

+

+Thanks, +

+

+Your Tireless Unglue.it Staff +

\ No newline at end of file diff --git a/settings/dev.py b/settings/dev.py index 27c53e1c..864b5535 100644 --- a/settings/dev.py +++ b/settings/dev.py @@ -129,4 +129,5 @@ UNGLUEIT_TEST_PASSWORD = None # decide which of the period tasks to add to the schedule #CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB #CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB +CELERYBEAT_SCHEDULE['report_new_ebooks'] = EBOOK_NOTIFICATIONS_JOB diff --git a/settings/please.py b/settings/please.py index 121e395e..e25f9178 100644 --- a/settings/please.py +++ b/settings/please.py @@ -121,4 +121,6 @@ IS_PREVIEW = False # decide which of the period tasks to add to the schedule #CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB +CELERYBEAT_SCHEDULE['report_new_ebooks'] = EBOOK_NOTIFICATIONS_JOB + CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB diff --git a/settings/prod.py b/settings/prod.py index b4a1ee21..2353bf15 100644 --- a/settings/prod.py +++ b/settings/prod.py @@ -122,3 +122,4 @@ STATIC_ROOT = '/var/www/static' # decide which of the period tasks to add to the schedule #CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB #CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB +CELERYBEAT_SCHEDULE['report_new_ebooks'] = EBOOK_NOTIFICATIONS_JOB