From 29498b1fa402cb0144193dd809cc84e6b4177ef0 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 26 Jul 2013 10:03:59 +0200 Subject: [PATCH] Fix fundraiser end email, meta helper in admin. --- apps/funding/locale/pl/LC_MESSAGES/django.mo | Bin 13396 -> 13491 bytes apps/funding/locale/pl/LC_MESSAGES/django.po | 62 ++++++++++-------- .../admin/funding/offer/change_form.html | 31 +++++++++ apps/funding/templates/funding/email/end.txt | 2 +- .../funding/tags/offer_status_more.html | 2 +- 5 files changed, 66 insertions(+), 31 deletions(-) create mode 100755 apps/funding/templates/admin/funding/offer/change_form.html diff --git a/apps/funding/locale/pl/LC_MESSAGES/django.mo b/apps/funding/locale/pl/LC_MESSAGES/django.mo index 239a2febc94c106ca42d5a5515243d706e03b932..97a2fc7419d4a477971f118451db3fd7ee41ae78 100644 GIT binary patch delta 2629 zcmYk-eN5F=9LMo52m%)bLIa9MPk*5oCkqa2M@)qTsv$^Hf zvRpO)DE-4md3#vaa!Xw+$DHL>t>(mBO}GBAhq=mT@6Wx*)*0XXI_LMhzjMy-obS0@ zYKizmm$MQM8Ks99OPn2I_8M+W;)8M}#Vi8{@j1Nd?D3clrTr&z$t=~Z9z0ly?WivL zaWsC2>G%~U;vfz)3)#<9hI8Q$Ou&>hvwJZe)j=U<<5Vof`KSrC;5h6>J%0q_u^&g` zN&FGd<3U|#v}RnuEEeJk+|Ky+8x>x{8t8QbcAz?b88x9(I0jE+0e+7acn9_76`5w! za4|BL^`hQ%H|qI=s26$#dBpmir!mO*c7e)Vth&c+1n$BIF^qci0nEW`n2fhk6Hd%B zshq%%aTK;N3oTV2=Hd-3!em~f z7>iMRT#MSQNRa35CVS=5Soa#;TkDrLN06CTGp%wPkr;db1B zHOxvKyn{3GI<{dhqqpK-R5JeV{2R43@hk^vWof9S8;L_O54Dox#<2cLRHnEKGf@wg zBQIeKQCqSJwU?c!fp#GIWKW|y-si5ri0b$->ib9C{kNPaP&sna-9H_2H_oCu{t|cN zMR$EIXR?lVEovg4qE_H*)LtgBz8Yv9UX0^=$Tr*be6yFZ3ZKRAP!rwgjg8~O0PRo< zm3dUYK}{fsOi`BSA$ew1s5e^U+O?cO(fW-s6_)C5we z#7@I_Wby0(a?9Sw>39VzFmr0`MOWbp+FcmxrE-P}eOoz)QhU^dkK*&r0cSRcznSY> zuns@R$8jQ~+{O?t#HUJPKWJxA6S;%?aq^7V_dmi!+L@)Szbe^mpq6MXCSV~B#YxT* z97cOK>U-7BWtc|021#(M$2{yq^?TIaKZbh#Jxs>Woaakfe|2z)3+i~#-MEgL$gh}z zw_H1kvzJ0U4bw3j`>+T#;p4aw`!Nes$-H@(hs$v@YGQ9Axo$Zc{BGG6ZciE$(t@cd zM~4&iWVOWq3$uyte7n2YhDAgwq2Ebu-bCVILZyLNOZbUJ#4>^(m}r*iOsKGT`te>I zJuI5*2tvDgxA>^6C#DfvOciB=7QC2PO{mlmvxqt2RmnM_Rk}o3Ky(vJ2<6OHLZye$ z=}{pK|10ZUO{=FBeT>i+PasI2=<07q?a~@z1)=2cB<2#@O^Q}3_TO+zv=;l=4uwQr ztQq}pt8Jc7EDn!K$qxnG9nnf;5*=z#8i@*G2%%&15K%>_6cCRP)x=UlKP*9F6QRu8 zKr|663GKa(8>b_hJn^XVfO1D!qFdjbJ}pt;zVheN4(ksBF@h9#HI^3EukQ&JM%lk2_Pm=WpE zJrYNk1Nj>wZ|1K~jPrzV75+47MSbJefWOhJXl?B3_WIhocRmsDdCz^~Yk()~{bwS< NHeYe%hoau}e*w5<7#IKm delta 2527 zcmYk-dra0<9LMo50&)=$(IiRYely6pr6?wnk|-jeh@r$q5Clc?Qnp&p)Rh~w#(Jvd z$Y?p&4J~7do4HzBS-Bc4SF*CLFgI}Ugg=zgFth16h6nLSXIr@0RN7aOF8d8za1xhc!!$F!Vi4o- zb&SG~F&M`%(#&JuQkhA|&lrR^@HYG#^@3RuX0vfFreZ#7LK`s|J5bN};S?Oi+wnD= zz%%%~`WdYq3z$V2zKlJLZxd9Qw5{i@8Q6$=@gdZN-oiWZ9W24~s4tF)Hp{`;$QZU9 z^@Y`_=bBI-(uO=@k30Kt7wrLD%=i{HgRjI@ScHwJFFuU1_%4RxXQ+veVGMqc<@hUV zf<<)ddM&QOCQQN;ScRjw5R+K0Y^+Dm5S2qz=3oJ{&=OT*Jf6ZdynuJ(Bx-N7_$=*d z7iz_x#uhx`+B2BFo-aZTScfaHAGKoN;7$yRW&O8O*~4cx;dgi$i`l?>Ok!4g!4sH| z?_(EU#ZIhc7D~d8oaazm^A(alb`h0qmyx`-Yp9jHjv@GG9P6)+TXg8bP}Y%;uo&cH zEfckuOHc!qB6(!xs2A6{{sz>0T2c4!aMyP^_n~s+Nq4=^_4j+I=*2JMQ+UK(NZ~9t z(au6mq!+aUgQ&gy8Z}TV>pT{~eaQCOUw85@j7l)ukH=6G%}Df*lY`x~3velVj#AMC zCNKrBA^BucWRAWl5!KE@4X_wBa3!*hwhnb)C#KY87rsR1Y`>tEJ~Y|) zyvL%c#04-zJjI1lo>mgxz}48CYPJ`TqgEn?QK;HN%)_O1qQ3NZT#K`^&Gum{@=Cje9_>vChjJyRIlG-B*iOF=e-m`z2K*dvVj`oJ zVf;Ph1-7Cl@+v-y=TZ09=lYZIq;mvA=s%mw`YV|}p<^n3;T*$A+85o8SDe=|g8n~{ z#I`^ZKuel}!B~pAz7q9(Er#M2=XQ5}FKPk@@>qY}&`XCV;zeccORoI}hS5HbQ8v2$$lASc$h#6RRX6$#GvkfUk7vuXle)tVf%nQbNomc)4vR{$KcF zU-oTxot>y-FpW@lK0ss;O9+)Mgw|e(q`j>m_-*l>Q5_2vw$YmTzvKI5Swlls&2xxqLS;QsNECUSLt{Nv>Z06F>?T$bwL}Y{vWHN*sF0ffl{#0u z59^5\n" "Language-Team: LANGUAGE \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" -#: models.py:45 models.py:176 models.py:197 +#: models.py:45 models.py:186 models.py:207 msgid "offer" msgstr "zbiórka" @@ -118,79 +118,79 @@ msgstr "zbiórka" msgid "offers" msgstr "zbiórki" -#: models.py:131 +#: models.py:141 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!" -#: 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." -#: models.py:177 +#: models.py:187 msgid "price" msgstr "cena" -#: models.py:178 models.py:198 +#: models.py:188 models.py:208 msgid "name" msgstr "nazwa" -#: models.py:179 +#: models.py:189 msgid "long name" msgstr "długa nazwa" -#: models.py:180 +#: models.py:190 msgid "end date" msgstr "data końcowa" -#: models.py:183 +#: models.py:193 msgid "perk" msgstr "prezent" -#: models.py:184 models.py:202 +#: models.py:194 models.py:212 msgid "perks" msgstr "prezenty" -#: models.py:199 +#: models.py:209 msgid "email" msgstr "e-mail" -#: models.py:200 models.py:277 +#: models.py:210 models.py:287 msgid "amount" msgstr "kwota" -#: models.py:201 +#: models.py:211 msgid "payed at" msgstr "data wpłaty" -#: models.py:204 +#: models.py:214 msgid "notifications" msgstr "powiadomienia" -#: models.py:208 +#: models.py:218 msgid "funding" msgstr "wpłata" -#: models.py:209 +#: models.py:219 templates/admin/funding/offer/change_form.html:22 msgid "fundings" msgstr "wpłaty" -#: models.py:278 +#: models.py:288 msgid "when" msgstr "kiedy" -#: models.py:281 +#: models.py:291 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" -#: 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!" @@ -233,7 +233,7 @@ msgstr "" "Wróć do aktualnej zbiórki 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!" @@ -276,11 +276,15 @@ msgstr "Anonim" 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:" -#: 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:" @@ -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 "" -"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 "" -"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 @@ -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 "" -"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 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 index 000000000..7b2f6de42 --- /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 }} + +{% endblock %} + + + +{% block pretitle %} + + +↓ {% trans "fundings" %} ↓ + +{{ block.super }} +{% endblock %} diff --git a/apps/funding/templates/funding/email/end.txt b/apps/funding/templates/funding/email/end.txt index 3f054e2be..023d34427 100755 --- 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 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' %} diff --git a/apps/funding/templates/funding/tags/offer_status_more.html b/apps/funding/templates/funding/tags/offer_status_more.html index 21e3315e1..c94c9a801 100755 --- 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 {{ bt }} 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 Editorial Platform.{% endblocktrans %} {% endif %} -- 2.20.1