Fix fundraiser end email, meta helper in admin.

diff --git a/apps/funding/locale/pl/LC_MESSAGES/django.mo b/apps/funding/locale/pl/LC_MESSAGES/django.mo
index 239a2fe..97a2fc7 100644 (file)
Binary files a/apps/funding/locale/pl/LC_MESSAGES/django.mo and b/apps/funding/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/funding/locale/pl/LC_MESSAGES/django.po b/apps/funding/locale/pl/LC_MESSAGES/django.po
index 750180f..6eb728a 100644 (file)
--- a/apps/funding/locale/pl/LC_MESSAGES/django.po
+++ b/apps/funding/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2013-07-15 12:55+0200\n"
-"PO-Revision-Date: 2013-07-15 12:57+0100\n"
+"POT-Creation-Date: 2013-07-26 10:00+0200\n"
+"PO-Revision-Date: 2013-07-26 10:01+0100\n"

 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"


@@ -110,7 +110,7 @@ msgstr "Wysłano powiadomienia o zakończeniu"
 msgid "Cover preview"
 msgstr "Podgląd okładki"
 
 msgid "Cover preview"
 msgstr "Podgląd okładki"
 

-#: models.py:45 models.py:176 models.py:197
+#: models.py:45 models.py:186 models.py:207

 msgid "offer"
 msgstr "zbiórka"
 
 msgid "offer"
 msgstr "zbiórka"
 


@@ -118,79 +118,79 @@ msgstr "zbiórka"
 msgid "offers"
 msgstr "zbiórki"
 
 msgid "offers"
 msgstr "zbiórki"
 

-#: models.py:131
+#: models.py:141

 msgid "The fundraiser has ended!"
 msgstr "Zbiórka dobiegła końca!"
 
 msgid "The fundraiser has ended!"
 msgstr "Zbiórka dobiegła końca!"
 

-#: models.py:147
+#: models.py:157

 msgid "The fundraiser will end soon!"
 msgstr "Zbiórka niedługo się zakończy!"
 
 msgid "The fundraiser will end soon!"
 msgstr "Zbiórka niedługo się zakończy!"
 

-#: models.py:161
+#: models.py:171

 msgid "The book you helped fund has been published."
 msgstr "Książka, którą pomogłeś/-aś ufundować, została opublikowana."
 
 msgid "The book you helped fund has been published."
 msgstr "Książka, którą pomogłeś/-aś ufundować, została opublikowana."
 

-#: models.py:177
+#: models.py:187

 msgid "price"
 msgstr "cena"
 
 msgid "price"
 msgstr "cena"
 

-#: models.py:178 models.py:198
+#: models.py:188 models.py:208

 msgid "name"
 msgstr "nazwa"
 
 msgid "name"
 msgstr "nazwa"
 

-#: models.py:179
+#: models.py:189

 msgid "long name"
 msgstr "długa nazwa"
 
 msgid "long name"
 msgstr "długa nazwa"
 

-#: models.py:180
+#: models.py:190

 msgid "end date"
 msgstr "data końcowa"
 
 msgid "end date"
 msgstr "data końcowa"
 

-#: models.py:183
+#: models.py:193

 msgid "perk"
 msgstr "prezent"
 
 msgid "perk"
 msgstr "prezent"
 

-#: models.py:184 models.py:202
+#: models.py:194 models.py:212

 msgid "perks"
 msgstr "prezenty"
 
 msgid "perks"
 msgstr "prezenty"
 

-#: models.py:199
+#: models.py:209

 msgid "email"
 msgstr "e-mail"
 
 msgid "email"
 msgstr "e-mail"
 

-#: models.py:200 models.py:277
+#: models.py:210 models.py:287

 msgid "amount"
 msgstr "kwota"
 
 msgid "amount"
 msgstr "kwota"
 

-#: models.py:201
+#: models.py:211

 msgid "payed at"
 msgstr "data wpłaty"
 
 msgid "payed at"
 msgstr "data wpłaty"
 

-#: models.py:204
+#: models.py:214

 msgid "notifications"
 msgstr "powiadomienia"
 
 msgid "notifications"
 msgstr "powiadomienia"
 

-#: models.py:208
+#: models.py:218

 msgid "funding"
 msgstr "wpłata"
 
 msgid "funding"
 msgstr "wpłata"
 

-#: models.py:209
+#: models.py:219 templates/admin/funding/offer/change_form.html:22

 msgid "fundings"
 msgstr "wpłaty"
 
 msgid "fundings"
 msgstr "wpłaty"
 

-#: models.py:278
+#: models.py:288

 msgid "when"
 msgstr "kiedy"
 
 msgid "when"
 msgstr "kiedy"
 

-#: models.py:281
+#: models.py:291

 msgid "money spent on a book"
 msgstr "pieniądze wydane na książkę"
 
 msgid "money spent on a book"
 msgstr "pieniądze wydane na książkę"
 

-#: models.py:282
+#: models.py:292

 msgid "money spent on books"
 msgstr "pieniądze wydane na książki"
 
 msgid "money spent on books"
 msgstr "pieniądze wydane na książki"
 

-#: models.py:308 templates/funding/thanks.html:6
+#: models.py:318 templates/funding/thanks.html:6

 #: templates/funding/thanks.html.py:13
 msgid "Thank you for your support!"
 msgstr "Dziękujemy za Twoje wsparcie!"
 #: templates/funding/thanks.html.py:13
 msgid "Thank you for your support!"
 msgstr "Dziękujemy za Twoje wsparcie!"


@@ -233,7 +233,7 @@ msgstr ""
 "Wróć do <a href=\"%(current)s\">aktualnej zbiórki</a> i spróbuj ponownie lub "
 "użyj innej metody płatności."
 
 "Wróć do <a href=\"%(current)s\">aktualnej zbiórki</a> i spróbuj ponownie lub "
 "użyj innej metody płatności."
 

-#: templates/funding/offer_detail.html:32 templates/funding/offer_list.html:29
+#: templates/funding/offer_detail.html:32 templates/funding/offer_list.html:31

 #: templates/funding/tags/funding.html:20
 #: templates/funding/tags/funding.html:46
 msgid "Help free the book!"
 #: templates/funding/tags/funding.html:20
 #: templates/funding/tags/funding.html:46
 msgid "Help free the book!"


@@ -276,11 +276,15 @@ msgstr "Anonim"
 msgid "All fundraisers"
 msgstr "Wszystkie zbiórki"
 
 msgid "All fundraisers"
 msgstr "Wszystkie zbiórki"
 

-#: templates/funding/offer_list.html:20
+#: templates/funding/offer_list.html:17

 msgid "Current fundraiser:"
 msgstr "Aktualna zbiórka:"
 
 msgid "Current fundraiser:"
 msgstr "Aktualna zbiórka:"
 

-#: templates/funding/offer_list.html:22 templates/funding/offer_list.html:37
+#: templates/funding/offer_list.html:23
+msgid "No fundraiser is currently running."
+msgstr "Obecnie nie jest aktywna żadna zbiórka."
+
+#: templates/funding/offer_list.html:24 templates/funding/offer_list.html:39

 msgid "Previous fundraisers:"
 msgstr "Poprzednie zbiórki:"
 
 msgid "Previous fundraisers:"
 msgstr "Poprzednie zbiórki:"
 


@@ -422,10 +426,10 @@ msgstr "Skontaktujemy się z Tobą w sprawie prezentów, które wybrałeś/-aś.
 #: templates/funding/email/end.txt:21
 #, python-format
 msgid ""
 #: templates/funding/email/end.txt:21
 #, python-format
 msgid ""

-"All of the money remaining after this fundraiser (%(x)s PLN)\n"
+"All of the money remaining after this fundraiser (%(r)s PLN)\n"

 "will be spent on liberating other books still waiting for publication."
 msgstr ""
 "will be spent on liberating other books still waiting for publication."
 msgstr ""

-"Wszystkie dodatkowe pieniądze pozostałe z tej zbiórki (%(x)s PLN)\n"
+"Wszystkie dodatkowe pieniądze pozostałe z tej zbiórki (%(r)s PLN)\n"

 "zostaną przeznaczone na uwolnienie innych książek czekających na publikację."
 
 #: templates/funding/email/end.txt:23 templates/funding/email/end.txt.py:34
 "zostaną przeznaczone na uwolnienie innych książek czekających na publikację."
 
 #: templates/funding/email/end.txt:23 templates/funding/email/end.txt.py:34


@@ -454,8 +458,8 @@ msgid ""
 "If you'd like to help liberate another book, or invite your friends\n"
 "to do so, we're currently raising money for:"
 msgstr ""
 "If you'd like to help liberate another book, or invite your friends\n"
 "to do so, we're currently raising money for:"
 msgstr ""

-"Jeśli chcesz pomóc uwolnić kolejną książkę, albo zachęcić do tegoswoich "
-"znajomych, to aktualnie zbieramy na:"
+"Jeśli chcesz pomóc uwolnić kolejną książkę, albo zachęcić do tego\n"
+"swoich znajomych, to aktualnie zbieramy na:"

 
 #: templates/funding/email/near.txt:5
 #, python-format
 
 #: templates/funding/email/near.txt:5
 #, python-format

diff --git a/apps/funding/templates/admin/funding/offer/change_form.html b/apps/funding/templates/admin/funding/offer/change_form.html
new file mode 100755 (executable)
index 0000000..7b2f6de
--- /dev/null
+++ b/apps/funding/templates/admin/funding/offer/change_form.html
@@ -0,0 +1,31 @@
+{% extends "admin/change_form.html" %}
+{% load i18n %}
+
+{% block extrahead %}
+{{ block.super }}
+<script type="text/javascript">
+(function($) {
+    $(document).ready(function($) {
+        $("#generated-switch").click(function() {
+            $('#generated').toggle()
+        });
+    });
+})(django.jQuery);
+</script>
+{% endblock %}
+
+
+
+{% block pretitle %}
+
+
+<a id="generated-switch">↓ {% trans "fundings" %} ↓</a>
+<div id="generated" style="display:none; padding:1em; border: 1px solid #aaa;">
+    {% for funding in original.funders %}
+        {% if funding.name %}
+            &lt;dc:contributor.funding>{{ funding.name }}&lt;/dc:contributor.funding><br/>
+        {% endif %}
+    {% endfor %}
+</div>
+{{ block.super }}
+{% endblock %}

diff --git a/apps/funding/templates/funding/email/end.txt b/apps/funding/templates/funding/email/end.txt
index 3f054e2..023d344 100755 (executable)
--- a/apps/funding/templates/funding/email/end.txt
+++ b/apps/funding/templates/funding/email/end.txt
@@ -18,7 +18,7 @@ of the amount of your contribution.{% endblocktrans %}
 {% blocktrans %}We will contact you again about details needed
 to deliver your perks.{% endblocktrans %}
 {% endif %}{# funding.perks.exists #}{% if remaining %}
 {% blocktrans %}We will contact you again about details needed
 to deliver your perks.{% endblocktrans %}
 {% endif %}{# funding.perks.exists #}{% if remaining %}

-{% blocktrans with r=remaining %}All of the money remaining after this fundraiser ({{ x }} PLN)
+{% blocktrans with r=remaining %}All of the money remaining after this fundraiser ({{ r }} PLN)

 will be spent on liberating other books still waiting for publication.{% endblocktrans %}
 {% blocktrans %}You can see how we're spending these funds on this page:{% endblocktrans %}
 http://{{ site.domain }}{% url 'funding_wlfund' %}
 will be spent on liberating other books still waiting for publication.{% endblocktrans %}
 {% blocktrans %}You can see how we're spending these funds on this page:{% endblocktrans %}
 http://{{ site.domain }}{% url 'funding_wlfund' %}

diff --git a/apps/funding/templates/funding/tags/offer_status_more.html b/apps/funding/templates/funding/tags/offer_status_more.html
index 21e3315..c94c9a8 100755 (executable)
--- a/apps/funding/templates/funding/tags/offer_status_more.html
+++ b/apps/funding/templates/funding/tags/offer_status_more.html
@@ -12,7 +12,7 @@
                 {% blocktrans with bu=offer.book.get_absolute_url bt=offer.book %}The book
                 <a href="{{ bu }}">{{ bt }}</a> has been already published.{% endblocktrans %}
             {% else %}
                 {% blocktrans with bu=offer.book.get_absolute_url bt=offer.book %}The book
                 <a href="{{ bu }}">{{ bt }}</a> has been already published.{% endblocktrans %}
             {% else %}

-                {% if offer.redakcja_link %}
+                {% if offer.redakcja_url %}

                     {% blocktrans with r=offer.redakcja_url %}You can follow
                     the work on the <a href="{{ r }}">Editorial Platform</a>.{% endblocktrans %}
                 {% endif %}
                     {% blocktrans with r=offer.redakcja_url %}You can follow
                     the work on the <a href="{{ r }}">Editorial Platform</a>.{% endblocktrans %}
                 {% endif %}