From f9ebfca6f51df543810066816ce90b79932cd458 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 22 May 2013 10:33:09 +0200 Subject: [PATCH 1/1] Changes to the wording, small cosmetic changes --- apps/funding/locale/pl/LC_MESSAGES/django.mo | Bin 6908 -> 7165 bytes apps/funding/locale/pl/LC_MESSAGES/django.po | 87 ++++++++++-------- .../funding/templates/funding/offer_list.html | 12 +-- .../funding/snippets/any_remaining.html | 2 +- .../templates/funding/tags/funding.html | 2 +- .../templates/funding/tags/offer_status.html | 8 +- apps/funding/templatetags/funding_tags.py | 3 +- 7 files changed, 64 insertions(+), 50 deletions(-) diff --git a/apps/funding/locale/pl/LC_MESSAGES/django.mo b/apps/funding/locale/pl/LC_MESSAGES/django.mo index 10ad21b76dd1bf15e061d2b40deddc2e7f094024..8c1eca14f30c3c4f5776fe15d4ff5dce7ff0dc2e 100644 GIT binary patch delta 2144 zcmY+^ZHQD=9LMqFj=K4f>#nA@W}eK)T+Ln6tu?dKO|y0pq0kcJ&d%N0yL;!snL9hq zNDOG(zED9Bp?y)1Aee80rZ*D{nJ_bv1RHRL+T|zL_X1A%n(jY49>MZLEJ^;}PMe{bYIWDVwEbblyn&!YMpj_PkVvHu$ISoGjKczKF3@1jEcMst1O z9O}ixn8r#}zl;3LA6zt{MqW~VF6#YdTr|N=sQX>`C~n6km~0{bI`tzoXs^#=D-*bg z{nWqZL~4RtxGcv#*ntJqAv}-I;W%_nZR14!2D9dsdD-7PX&1bu<>WzmJ;01=IvSjOw4FB3DDsxA_t^ zu^&)da0{m~zPU$%1sWC@?&Uh%PS$=ZDV$2rle@zb2P$%s$0@MjaKfvR=!eO2)t}iG zvL>lSaZflX!7Zpp^o{!GrbD^|Pd#G1V2siNomGi{Wzg}CqK2do!ZC!Me< zXUGl9!;a@Wao@GPZQWrvSE9G-+!;MF$EIC3L5G2pOS%DlmaiVQLB=M$q!)N)z2Ej< z|9zQM)}x!K|H!! zWj9`b@&6NVv+;Ug<#76r@0Bw}r#9MVGufQe7nU`STh3lR>I7-VDohUM)kba6=G|P; f%hO&YvaVlH#8`&YH?ZEka`jSa(5;?Y=*RvAA21+s delta 1807 zcmXxkduYvJ9LMqR&M~tYzwh%r=WofMv5}TQhl56` zB>EHEeP-*itpg{@u8wADxEnd_FsEc}#?5#NldwOhu9$_1ScqM)6nkI=s>>?muvMJ0 z%pz7zWiS`^qJDT5``~SC#aFlhZ*($C!2oa1!A#V1Gf*8@<4D|ysdxl6pcC%?MeIfU z3hIL%$BdZ0p%Ui8SL}&F-cpKNu{WN_bi9v@!CH~S+BgO9CuU$u=l1K_IEZ!uYT%2p z7?0s1e1Xc)C`OsX`>lwIQn?%p@F6Zk<*yK`@G$N}O+hZ7CG(LnTM5#qO+i0aqF%7j zwU?p>UWFvn*1C2rMwF5*RP^PIs8lwiUT_@M(P`H{hwA7O>UTHY{kzTw$k^?PyZ_o< ze~aqxlWTuPz3*37=3gCkVM1;skWN%epLT11@q5&RpRobIyLPC%8Ha7*qyg=8?ft0d zkD~g$;O<|>A+&E{CcZ~4_QU}B*BlS#seTNg6j#z-!b;Q#qnL&Fa14G%Ek2K%Q*ah) zE$l(f`9V~QFCvFs=cKjs6g99m4B+UBq+5xmP zQK=q}**F{L;U>((t2hTgqB2-S=ku`~cj6w@{YZelHj~N<9FE7(MH{i}{v)=IioT>4HJ1&}ZSHy_s-r{h zdNXPOCs6}9\n" "Language-Team: LANGUAGE \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.
Nie będzie publikowany." -#: models.py:15 +#: models.py:16 msgid "author" msgstr "autor" -#: models.py:16 +#: models.py:17 msgid "title" msgstr "tytuł" -#: models.py:17 +#: models.py:18 msgid "slug" msgstr "slug" -#: models.py:18 models.py:113 +#: models.py:19 models.py:114 msgid "description" msgstr "opis" -#: models.py:19 +#: models.py:20 msgid "target" msgstr "kwota docelowa" -#: models.py:20 +#: models.py:21 msgid "start" msgstr "początek" -#: models.py:21 +#: models.py:22 msgid "end" msgstr "koniec" -#: models.py:22 +#: models.py:23 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." -#: models.py:24 +#: models.py:25 msgid "redakcja URL" msgstr "URL na Redakcji" -#: models.py:26 +#: models.py:27 msgid "Published book." msgstr "Opublikowana książka." -#: models.py:27 +#: models.py:28 msgid "Cover" msgstr "Okładka" -#: models.py:28 +#: models.py:29 msgid "Poll" msgstr "Ankieta" -#: models.py:32 +#: models.py:33 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" -#: models.py:37 +#: models.py:38 msgid "offers" msgstr "zbiórki" -#: models.py:111 +#: models.py:112 msgid "price" msgstr "cena" -#: models.py:112 models.py:132 +#: models.py:113 models.py:133 msgid "name" msgstr "nazwa" -#: models.py:114 +#: models.py:115 msgid "end date" msgstr "data końcowa" -#: models.py:117 +#: models.py:118 msgid "perk" msgstr "prezent" -#: models.py:118 models.py:136 +#: models.py:119 models.py:137 msgid "perks" msgstr "prezenty" -#: models.py:133 +#: models.py:134 msgid "email" msgstr "e-mail" -#: models.py:134 models.py:163 +#: models.py:135 models.py:164 msgid "amount" msgstr "kwota" -#: models.py:135 +#: models.py:136 msgid "payed at" msgstr "data wpłaty" -#: models.py:146 +#: models.py:147 msgid "funding" msgstr "wpłata" -#: models.py:147 +#: models.py:148 msgid "fundings" msgstr "wpłaty" -#: models.py:164 +#: models.py:165 msgid "when" msgstr "kiedy" -#: models.py:167 +#: models.py:168 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" @@ -175,7 +175,7 @@ msgstr "" "Wróć do aktualnej zbiórki 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!" @@ -235,7 +235,7 @@ msgid "Thank you!" 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ę!" @@ -317,10 +317,10 @@ msgstr "Pieniądze pozostałe ze zbiórki na" #, python-format msgid "" "Any remaining funds will be spent\n" -"on other books waiting to be published in the library." +"on other books waiting to be published." msgstr "" "Wszelkie pozostałe środki 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!" @@ -341,13 +341,22 @@ msgstr "do końca zbiórki" #: 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 "" -"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." diff --git a/apps/funding/templates/funding/offer_list.html b/apps/funding/templates/funding/offer_list.html index ffb6af000..0770b100e 100755 --- a/apps/funding/templates/funding/offer_list.html +++ b/apps/funding/templates/funding/offer_list.html @@ -22,14 +22,14 @@

{% trans "Previous fundraisers:" %}

{% endif %} -
- {% offer_status offer %} -
- - {% funding offer link=1 %} - + {% funding offer link=1 show_title_calling=False %}
+ {% if is_current %} +

{% trans "Help free the book!" %}

+ {{ offer.description|safe }} + {% endif %} + {% offer_status offer %} {% offer_status_more offer %}
diff --git a/apps/funding/templates/funding/snippets/any_remaining.html b/apps/funding/templates/funding/snippets/any_remaining.html index 86db70fd3..cebb75874 100755 --- 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 remaining funds 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 502108af8..ffe326e9c 100755 --- 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 %}{% endif %} {% if show_title %} - {% if is_current %}{% trans "Help free the book!" %}{% endif %} + {% if is_current and show_title_calling %}{% trans "Help free the book!" %}{% endif %} {{ offer }} {% endif %} diff --git a/apps/funding/templates/funding/tags/offer_status.html b/apps/funding/templates/funding/tags/offer_status.html index 24a5fcde7..1c140686f 100755 --- a/apps/funding/templates/funding/tags/offer_status.html +++ b/apps/funding/templates/funding/tags/offer_status.html @@ -8,8 +8,12 @@

{% else %}

- {% blocktrans with due=offer.due end=offer.end %}If the target is met - by {{ end }}, this book will be published by {{ due }}.{% endblocktrans %} + {% blocktrans with target=offer.target|floatformat %}W need {{target}} zł to digitize it, + compile it and publish for free in multiple formats.{% endblocktrans %} +

+

+ {% blocktrans with end=offer.end %}If we raise enought money before {{end}} we will + publish it and make it available for everyone.{% endblocktrans %}

{% endif %} {% else %} diff --git a/apps/funding/templatetags/funding_tags.py b/apps/funding/templatetags/funding_tags.py index 7ebc72675..eb60601ad 100755 --- 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) -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: @@ -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, + 'show_title_calling': show_title_calling, 'add_class': add_class, } -- 2.20.1