Changes to the wording, small cosmetic changes

diff --git a/apps/funding/locale/pl/LC_MESSAGES/django.mo b/apps/funding/locale/pl/LC_MESSAGES/django.mo
index 10ad21b..8c1eca1 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 13e9228..e7e6148 100644 (file)
--- a/apps/funding/locale/pl/LC_MESSAGES/django.po
+++ b/apps/funding/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ 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-05-20 14:06+0200\n"
+"POT-Creation-Date: 2013-05-22 10:32+0200\n"

 "PO-Revision-Date: 2013-04-25 13:03+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: 2013-04-25 13:03+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -42,119 +42,119 @@ msgstr ""
 "Użyjemy go do kontaktu w sprawie prezentów i informacji o zmianach statusu "
 "zbiórki i kolejnych akcjach.<br/>Nie będzie publikowany."
 
 "Użyjemy go do kontaktu w sprawie prezentów i informacji o zmianach statusu "
 "zbiórki i kolejnych akcjach.<br/>Nie będzie publikowany."
 

-#: models.py:15
+#: models.py:16

 msgid "author"
 msgstr "autor"
 
 msgid "author"
 msgstr "autor"
 

-#: models.py:16
+#: models.py:17

 msgid "title"
 msgstr "tytuł"
 
 msgid "title"
 msgstr "tytuł"
 

-#: models.py:17
+#: models.py:18

 msgid "slug"
 msgstr "slug"
 
 msgid "slug"
 msgstr "slug"
 

-#: models.py:18 models.py:113
+#: models.py:19 models.py:114

 msgid "description"
 msgstr "opis"
 
 msgid "description"
 msgstr "opis"
 

-#: models.py:19
+#: models.py:20

 msgid "target"
 msgstr "kwota docelowa"
 
 msgid "target"
 msgstr "kwota docelowa"
 

-#: models.py:20
+#: models.py:21

 msgid "start"
 msgstr "początek"
 
 msgid "start"
 msgstr "początek"
 

-#: models.py:21
+#: models.py:22

 msgid "end"
 msgstr "koniec"
 
 msgid "end"
 msgstr "koniec"
 

-#: models.py:22
+#: models.py:23

 msgid "due"
 msgstr "data publikacji"
 
 msgid "due"
 msgstr "data publikacji"
 

-#: models.py:23
+#: models.py:24

 msgid "When will it be published if the money is raised."
 msgstr "Kiedy książka zostanie opublikowana, jeśli uda się zebrać pieniądze."
 
 msgid "When will it be published if the money is raised."
 msgstr "Kiedy książka zostanie opublikowana, jeśli uda się zebrać pieniądze."
 

-#: models.py:24
+#: models.py:25

 msgid "redakcja URL"
 msgstr "URL na Redakcji"
 
 msgid "redakcja URL"
 msgstr "URL na Redakcji"
 

-#: models.py:26
+#: models.py:27

 msgid "Published book."
 msgstr "Opublikowana książka."
 
 msgid "Published book."
 msgstr "Opublikowana książka."
 

-#: models.py:27
+#: models.py:28

 msgid "Cover"
 msgstr "Okładka"
 
 msgid "Cover"
 msgstr "Okładka"
 

-#: models.py:28
+#: models.py:29

 msgid "Poll"
 msgstr "Ankieta"
 
 msgid "Poll"
 msgstr "Ankieta"
 

-#: models.py:32
+#: models.py:33

 msgid "Cover preview"
 msgstr "Podgląd okładki"
 
 msgid "Cover preview"
 msgstr "Podgląd okładki"
 

-#: models.py:36 models.py:110 models.py:131
+#: models.py:37 models.py:111 models.py:132

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

-#: models.py:37
+#: models.py:38

 msgid "offers"
 msgstr "zbiórki"
 
 msgid "offers"
 msgstr "zbiórki"
 

-#: models.py:111
+#: models.py:112

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

-#: models.py:112 models.py:132
+#: models.py:113 models.py:133

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

-#: models.py:114
+#: models.py:115

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

-#: models.py:117
+#: models.py:118

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

-#: models.py:118 models.py:136
+#: models.py:119 models.py:137

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

-#: models.py:133
+#: models.py:134

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

-#: models.py:134 models.py:163
+#: models.py:135 models.py:164

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

-#: models.py:135
+#: models.py:136

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

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

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

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

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

-#: models.py:164
+#: models.py:165

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

-#: models.py:167
+#: models.py:168

 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:168
+#: models.py:169

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


@@ -175,7 +175,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:25
+#: templates/funding/offer_detail.html:25 templates/funding/offer_list.html:29

 #: 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!"


@@ -235,7 +235,7 @@ msgid "Thank you!"
 msgstr "Dziękujemy!"
 
 #: templates/funding/thanks.html:16
 msgstr "Dziękujemy!"
 
 #: templates/funding/thanks.html:16

-#: templates/funding/tags/offer_status.html:18
+#: templates/funding/tags/offer_status.html:22

 msgid "Full amount was successfully raised!"
 msgstr "Udało się zebrać pełną kwotę!"
 
 msgid "Full amount was successfully raised!"
 msgstr "Udało się zebrać pełną kwotę!"
 


@@ -317,10 +317,10 @@ msgstr "Pieniądze pozostałe ze zbiórki na"
 #, python-format
 msgid ""
 "Any <a href=\"%(wlfund)s\">remaining funds</a> will be spent\n"
 #, python-format
 msgid ""
 "Any <a href=\"%(wlfund)s\">remaining funds</a> will be spent\n"

-"on other books waiting to be published in the library."
+"on other books waiting to be published."

 msgstr ""
 "Wszelkie <a href=\"%(wlfund)s\">pozostałe środki</a> przeznaczymy na inne "
 msgstr ""
 "Wszelkie <a href=\"%(wlfund)s\">pozostałe środki</a> przeznaczymy na inne "

-"książki czekające na publikację w serwisie."
+"książki czekające na publikację."

 
 #: templates/funding/tags/funding.html:10
 msgid "Support!"
 
 #: templates/funding/tags/funding.html:10
 msgid "Support!"


@@ -341,13 +341,22 @@ msgstr "do końca zbiórki"
 #: templates/funding/tags/offer_status.html:11
 #, python-format
 msgid ""
 #: templates/funding/tags/offer_status.html:11
 #, python-format
 msgid ""

-"If the target is met\n"
-"        by %(end)s, this book will be published by %(due)s."
+"W need %(target)s zł to digitize it,\n"
+"        compile it and publish for free in multiple formats."

 msgstr ""
 msgstr ""

-"Jeśli do %(end)s uda się zebrać pełną kwotę, książka zostanie opublikowana "
-"do %(due)s."
+"Potrzebujemy %(target)s zł, by ją zdigitalizować, opracować i bezpłatnie "
+"udostępnić w serwisie w wielu formatach."

 
 

-#: templates/funding/tags/offer_status.html:22
+#: templates/funding/tags/offer_status.html:15
+#, python-format
+msgid ""
+"If we raise enought money before %(end)s we will\n"
+"        publish it and make it available for everyone."
+msgstr ""
+"Jeśli do %(end)s uda się zebrać pełną kwotę, opublikujemy ją i będzie "
+"dostępna dla wszystkich"
+
+#: templates/funding/tags/offer_status.html:26

 msgid "The amount needed was not raised."
 msgstr "Nie udało się zebrać pełnej kwoty."
 
 msgid "The amount needed was not raised."
 msgstr "Nie udało się zebrać pełnej kwoty."
 

diff --git a/apps/funding/templates/funding/offer_list.html b/apps/funding/templates/funding/offer_list.html
index ffb6af0..0770b10 100755 (executable)
--- a/apps/funding/templates/funding/offer_list.html
+++ b/apps/funding/templates/funding/offer_list.html
@@ -22,14 +22,14 @@
         <h2>{% trans "Previous fundraisers:" %}</h2>
     {% endif %}
 
         <h2>{% trans "Previous fundraisers:" %}</h2>
     {% endif %}
 

-    <div class="white-box normal-text">
-        {% offer_status offer %}
-    </div>
-
-    {% funding offer link=1 %}
-
+    {% funding offer link=1 show_title_calling=False %}

 
     <div class="white-box normal-text">
 
     <div class="white-box normal-text">

+        {% if is_current %}
+            <h3>{% trans "Help free the book!" %}</h3>
+            {{ offer.description|safe }}
+        {% endif %}
+        {% offer_status offer %}

         {% offer_status_more offer %}
     </div>
 
         {% offer_status_more offer %}
     </div>
 

diff --git a/apps/funding/templates/funding/snippets/any_remaining.html b/apps/funding/templates/funding/snippets/any_remaining.html
index 86db70f..cebb758 100755 (executable)
--- a/apps/funding/templates/funding/snippets/any_remaining.html
+++ b/apps/funding/templates/funding/snippets/any_remaining.html
@@ -1,4 +1,4 @@
 {% load i18n %}
 {% url 'funding_wlfund' as wlfund %}
 {% blocktrans %}Any <a href="{{wlfund}}">remaining funds</a> will be spent
 {% load i18n %}
 {% url 'funding_wlfund' as wlfund %}
 {% blocktrans %}Any <a href="{{wlfund}}">remaining funds</a> will be spent

-on other books waiting to be published in the library.{% endblocktrans %}
+on other books waiting to be published.{% endblocktrans %}

diff --git a/apps/funding/templates/funding/tags/funding.html b/apps/funding/templates/funding/tags/funding.html
index 502108a..ffe326e 100755 (executable)
--- a/apps/funding/templates/funding/tags/funding.html
+++ b/apps/funding/templates/funding/tags/funding.html
@@ -17,7 +17,7 @@
         style="display: inline-block;">
     {% if link %}<a href="{% if is_current %}{% url 'funding_current' offer.slug %}{% else %}{{ offer.get_absolute_url }}{% endif %}">{% endif %}
     {% if show_title %}
         style="display: inline-block;">
     {% if link %}<a href="{% if is_current %}{% url 'funding_current' offer.slug %}{% else %}{{ offer.get_absolute_url }}{% endif %}">{% endif %}
     {% if show_title %}

-        {% if is_current %}<strong style="margin-right: .6em;">{% trans "Help free the book!" %}</strong>{% endif %}
+        {% if is_current and show_title_calling %}<strong style="margin-right: .6em;">{% trans "Help free the book!" %}</strong>{% endif %}

         <span class="funding-title{% if not is_current %}-strong{% endif %}">{{ offer }}</span>
     {% endif %}
 
         <span class="funding-title{% if not is_current %}-strong{% endif %}">{{ offer }}</span>
     {% endif %}
 

diff --git a/apps/funding/templates/funding/tags/offer_status.html b/apps/funding/templates/funding/tags/offer_status.html
index 24a5fcd..1c14068 100755 (executable)
--- a/apps/funding/templates/funding/tags/offer_status.html
+++ b/apps/funding/templates/funding/tags/offer_status.html
@@ -8,8 +8,12 @@
         </p>
     {% else %}
     <p>
         </p>
     {% else %}
     <p>

-        {% blocktrans with due=offer.due end=offer.end %}If the target is met
-        by {{ end }}, this book will be published by {{ due }}.{% endblocktrans %}
+        <strong>{% blocktrans with target=offer.target|floatformat %}W need {{target}} zł to digitize it,
+        compile it and publish for free in multiple formats.{% endblocktrans %}</strong>
+    </p>
+    <p>
+        {% blocktrans with end=offer.end %}If we raise enought money before {{end}} we will
+        publish it and make it available for everyone.{% endblocktrans %}

     </p>
     {% endif %}
 {% else %}
     </p>
     {% endif %}
 {% else %}

diff --git a/apps/funding/templatetags/funding_tags.py b/apps/funding/templatetags/funding_tags.py
index 7ebc726..eb60601 100755 (executable)
--- a/apps/funding/templatetags/funding_tags.py
+++ b/apps/funding/templatetags/funding_tags.py
@@ -5,7 +5,7 @@ register = template.Library()
 
 
 @register.inclusion_tag("funding/tags/funding.html", takes_context=True)
 
 
 @register.inclusion_tag("funding/tags/funding.html", takes_context=True)

-def funding(context, offer=None, link=False, closeable=False, show_title=True, add_class=""):
+def funding(context, offer=None, link=False, closeable=False, show_title=True, show_title_calling = True, add_class=""):

     if offer is None and context.get('funding_no_show_current') is None:
         offer = Offer.current()
     if offer is None:
     if offer is None and context.get('funding_no_show_current') is None:
         offer = Offer.current()
     if offer is None:


@@ -22,6 +22,7 @@ def funding(context, offer=None, link=False, closeable=False, show_title=True, a
         'link': link,
         'closeable': closeable,
         'show_title': show_title,
         'link': link,
         'closeable': closeable,
         'show_title': show_title,

+        'show_title_calling': show_title_calling,

         'add_class': add_class,
     }
 
         'add_class': add_class,
     }