From b39c329ecd604d815de1f772ed9c2e9598db4c46 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Thu, 10 Jun 2021 14:08:11 +0200 Subject: [PATCH 1/1] Collection link on main and slight funding wording change. --- src/funding/forms.py | 4 +-- src/funding/locale/de/LC_MESSAGES/django.po | 13 ++++----- src/funding/locale/en/LC_MESSAGES/django.po | 13 ++++----- src/funding/locale/es/LC_MESSAGES/django.po | 13 ++++----- src/funding/locale/fr/LC_MESSAGES/django.po | 13 ++++----- src/funding/locale/it/LC_MESSAGES/django.po | 13 ++++----- src/funding/locale/lt/LC_MESSAGES/django.po | 13 ++++----- src/funding/locale/pl/LC_MESSAGES/django.mo | Bin 13612 -> 13409 bytes src/funding/locale/pl/LC_MESSAGES/django.po | 30 +++++++++----------- src/funding/locale/ru/LC_MESSAGES/django.po | 13 ++++----- src/funding/locale/uk/LC_MESSAGES/django.po | 13 ++++----- src/wolnelektury/templates/main_page.html | 2 +- src/wolnelektury/views.py | 4 +++ 13 files changed, 69 insertions(+), 75 deletions(-) diff --git a/src/funding/forms.py b/src/funding/forms.py index c3661d5e9..ef797740f 100644 --- a/src/funding/forms.py +++ b/src/funding/forms.py @@ -21,8 +21,8 @@ class FundingForm(NewsletterForm): email = forms.EmailField( label=_("Contact e-mail"), help_text=mark_safe(_( - "We'll use it to contact you about the details needed for your perks,
" - "and to send you updates about your payment and the fundraiser status (which you can always turn off).
" + "We'll use it to " + "send you updates about your payment and the fundraiser status (which you can always turn off).
" "Your e-mail won't be publicised.")), required=False) data_processing_part2 = '''\ diff --git a/src/funding/locale/de/LC_MESSAGES/django.po b/src/funding/locale/de/LC_MESSAGES/django.po index 475cf33c4..81d737d3d 100644 --- a/src/funding/locale/de/LC_MESSAGES/django.po +++ b/src/funding/locale/de/LC_MESSAGES/django.po @@ -51,8 +51,7 @@ msgstr "" #: funding/forms.py:24 msgid "" -"We'll use it to contact you about the details needed for your perks,
and to send you updates about your payment and the fundraiser " +"We'll use it to send you updates about your payment and the fundraiser " "status (which you can always turn off).
Your e-mail won't be publicised." msgstr "" @@ -165,7 +164,7 @@ msgstr "" msgid "email" msgstr "" -#: funding/models.py:273 funding/models.py:352 +#: funding/models.py:273 funding/models.py:355 msgid "amount" msgstr "" @@ -186,19 +185,19 @@ msgstr "" msgid "fundings" msgstr "" -#: funding/models.py:353 +#: funding/models.py:356 msgid "when" msgstr "" -#: funding/models.py:356 +#: funding/models.py:359 msgid "money spent on a book" msgstr "" -#: funding/models.py:357 +#: funding/models.py:360 msgid "money spent on books" msgstr "" -#: funding/models.py:385 funding/templates/funding/thanks.html:6 +#: funding/models.py:388 funding/templates/funding/thanks.html:6 #: funding/templates/funding/thanks.html:13 msgid "Thank you for your support!" msgstr "" diff --git a/src/funding/locale/en/LC_MESSAGES/django.po b/src/funding/locale/en/LC_MESSAGES/django.po index 7ce9bd354..50bea65fb 100644 --- a/src/funding/locale/en/LC_MESSAGES/django.po +++ b/src/funding/locale/en/LC_MESSAGES/django.po @@ -50,8 +50,7 @@ msgstr "" #: funding/forms.py:24 msgid "" -"We'll use it to contact you about the details needed for your perks,
and to send you updates about your payment and the fundraiser " +"We'll use it to send you updates about your payment and the fundraiser " "status (which you can always turn off).
Your e-mail won't be publicised." msgstr "" @@ -164,7 +163,7 @@ msgstr "" msgid "email" msgstr "" -#: funding/models.py:273 funding/models.py:352 +#: funding/models.py:273 funding/models.py:355 msgid "amount" msgstr "" @@ -185,19 +184,19 @@ msgstr "" msgid "fundings" msgstr "" -#: funding/models.py:353 +#: funding/models.py:356 msgid "when" msgstr "" -#: funding/models.py:356 +#: funding/models.py:359 msgid "money spent on a book" msgstr "" -#: funding/models.py:357 +#: funding/models.py:360 msgid "money spent on books" msgstr "" -#: funding/models.py:385 funding/templates/funding/thanks.html:6 +#: funding/models.py:388 funding/templates/funding/thanks.html:6 #: funding/templates/funding/thanks.html:13 msgid "Thank you for your support!" msgstr "" diff --git a/src/funding/locale/es/LC_MESSAGES/django.po b/src/funding/locale/es/LC_MESSAGES/django.po index 475cf33c4..81d737d3d 100644 --- a/src/funding/locale/es/LC_MESSAGES/django.po +++ b/src/funding/locale/es/LC_MESSAGES/django.po @@ -51,8 +51,7 @@ msgstr "" #: funding/forms.py:24 msgid "" -"We'll use it to contact you about the details needed for your perks,
and to send you updates about your payment and the fundraiser " +"We'll use it to send you updates about your payment and the fundraiser " "status (which you can always turn off).
Your e-mail won't be publicised." msgstr "" @@ -165,7 +164,7 @@ msgstr "" msgid "email" msgstr "" -#: funding/models.py:273 funding/models.py:352 +#: funding/models.py:273 funding/models.py:355 msgid "amount" msgstr "" @@ -186,19 +185,19 @@ msgstr "" msgid "fundings" msgstr "" -#: funding/models.py:353 +#: funding/models.py:356 msgid "when" msgstr "" -#: funding/models.py:356 +#: funding/models.py:359 msgid "money spent on a book" msgstr "" -#: funding/models.py:357 +#: funding/models.py:360 msgid "money spent on books" msgstr "" -#: funding/models.py:385 funding/templates/funding/thanks.html:6 +#: funding/models.py:388 funding/templates/funding/thanks.html:6 #: funding/templates/funding/thanks.html:13 msgid "Thank you for your support!" msgstr "" diff --git a/src/funding/locale/fr/LC_MESSAGES/django.po b/src/funding/locale/fr/LC_MESSAGES/django.po index 41a23c7bb..d69574c45 100644 --- a/src/funding/locale/fr/LC_MESSAGES/django.po +++ b/src/funding/locale/fr/LC_MESSAGES/django.po @@ -51,8 +51,7 @@ msgstr "" #: funding/forms.py:24 msgid "" -"We'll use it to contact you about the details needed for your perks,
and to send you updates about your payment and the fundraiser " +"We'll use it to send you updates about your payment and the fundraiser " "status (which you can always turn off).
Your e-mail won't be publicised." msgstr "" @@ -165,7 +164,7 @@ msgstr "" msgid "email" msgstr "" -#: funding/models.py:273 funding/models.py:352 +#: funding/models.py:273 funding/models.py:355 msgid "amount" msgstr "" @@ -186,19 +185,19 @@ msgstr "" msgid "fundings" msgstr "" -#: funding/models.py:353 +#: funding/models.py:356 msgid "when" msgstr "" -#: funding/models.py:356 +#: funding/models.py:359 msgid "money spent on a book" msgstr "" -#: funding/models.py:357 +#: funding/models.py:360 msgid "money spent on books" msgstr "" -#: funding/models.py:385 funding/templates/funding/thanks.html:6 +#: funding/models.py:388 funding/templates/funding/thanks.html:6 #: funding/templates/funding/thanks.html:13 msgid "Thank you for your support!" msgstr "" diff --git a/src/funding/locale/it/LC_MESSAGES/django.po b/src/funding/locale/it/LC_MESSAGES/django.po index 475cf33c4..81d737d3d 100644 --- a/src/funding/locale/it/LC_MESSAGES/django.po +++ b/src/funding/locale/it/LC_MESSAGES/django.po @@ -51,8 +51,7 @@ msgstr "" #: funding/forms.py:24 msgid "" -"We'll use it to contact you about the details needed for your perks,
and to send you updates about your payment and the fundraiser " +"We'll use it to send you updates about your payment and the fundraiser " "status (which you can always turn off).
Your e-mail won't be publicised." msgstr "" @@ -165,7 +164,7 @@ msgstr "" msgid "email" msgstr "" -#: funding/models.py:273 funding/models.py:352 +#: funding/models.py:273 funding/models.py:355 msgid "amount" msgstr "" @@ -186,19 +185,19 @@ msgstr "" msgid "fundings" msgstr "" -#: funding/models.py:353 +#: funding/models.py:356 msgid "when" msgstr "" -#: funding/models.py:356 +#: funding/models.py:359 msgid "money spent on a book" msgstr "" -#: funding/models.py:357 +#: funding/models.py:360 msgid "money spent on books" msgstr "" -#: funding/models.py:385 funding/templates/funding/thanks.html:6 +#: funding/models.py:388 funding/templates/funding/thanks.html:6 #: funding/templates/funding/thanks.html:13 msgid "Thank you for your support!" msgstr "" diff --git a/src/funding/locale/lt/LC_MESSAGES/django.po b/src/funding/locale/lt/LC_MESSAGES/django.po index 10a3d20aa..17e866668 100644 --- a/src/funding/locale/lt/LC_MESSAGES/django.po +++ b/src/funding/locale/lt/LC_MESSAGES/django.po @@ -52,8 +52,7 @@ msgstr "" #: funding/forms.py:24 msgid "" -"We'll use it to contact you about the details needed for your perks,
and to send you updates about your payment and the fundraiser " +"We'll use it to send you updates about your payment and the fundraiser " "status (which you can always turn off).
Your e-mail won't be publicised." msgstr "" @@ -166,7 +165,7 @@ msgstr "" msgid "email" msgstr "" -#: funding/models.py:273 funding/models.py:352 +#: funding/models.py:273 funding/models.py:355 msgid "amount" msgstr "" @@ -187,19 +186,19 @@ msgstr "" msgid "fundings" msgstr "" -#: funding/models.py:353 +#: funding/models.py:356 msgid "when" msgstr "" -#: funding/models.py:356 +#: funding/models.py:359 msgid "money spent on a book" msgstr "" -#: funding/models.py:357 +#: funding/models.py:360 msgid "money spent on books" msgstr "" -#: funding/models.py:385 funding/templates/funding/thanks.html:6 +#: funding/models.py:388 funding/templates/funding/thanks.html:6 #: funding/templates/funding/thanks.html:13 msgid "Thank you for your support!" msgstr "" diff --git a/src/funding/locale/pl/LC_MESSAGES/django.mo b/src/funding/locale/pl/LC_MESSAGES/django.mo index 85a86dceb9bdbdb0c42a10c25bda13cfe7e14212..99760e1bb8be895fa95a57754545047ec5608a84 100644 GIT binary patch delta 1386 zcmXZbSxA&o6u|K_Hs&_wLYC_|Wt;oVIA~~Pf~|@zniOgzX`?NsVarPl20>vYHBllx z7*X_K5{?xLQIHlyR8&4mL8jD85>XKOQ2*21r{6vI-tV4smv7+UrUd7O_wjdK`59Figug*FVuMAUWd7>-LZ46{vKkRrbS zAFiPzfq{*<5bM#39jJ*;U^JdaUAWuyUqW5D7h~}T>UTq^^Bx)>p^f;d8GmE?CsKUD z1e0`}Wx|vhXh{{>N8E;5&}-C_m_|LJ#I#_dR=jLs9wwtDT_m3IRENk_%*QT#hFZ|( zCBb}E*haj|N28R+m>IAx70Dou!Z^%F-C>!Dx1uJfN8RaBT!fvd^SW_4UO`=F6l3rs zQlrcwdk`CgdKJD*8oGcBAK+&6;$N&l?=p@b1E?pF#p*Pr6y4Z_EAg7?e~j~pr!f=1 zq6gzwi13VL6INm)Mv`9!X|Q=2L9J*KHPL5WjK5KL97`5GvJ5Q3%gDQv7q}K@Q0Hf? z;-O&)>Z9C?Vc3E?-i{ma9NNh*uW0Dw_=bA7e~_F~LHT8P3|nv*^~1C*kqfvVwSez< z2&1xtiBBS3(uestj_dIk>P8E5M7H5>%p||up>Yb|qTW$OF4usq#v$Vzdg(9E3qH;P ztR;>n%S~)TJ^FAbe-hfT1glXC>cNXRiu&Ca7v~>Jqo0O)8}+CLP#@PY&c_ks6O1N) zjyi9`_yKLiGsq7hKhTcxJP=*ig*sk@`h7Wu<4!l{uZ=o0p$YW_I#3hzn2Fa=3+l%h zyk+A1sCPVy3vdk2;5*d9Yx!sEumR(71odxwiB)LxkX(s)CUML;gv^%!SC6A;$Bu?N>ti;|eu1WM058z|?HdbI3 zHLr!$ID=LAz85cU5oh(_Crmuf!bz;db6Ac)pk8zZ*Wp#v#D977w^0+{#SM55^<3Fj zcVD&VdaPl-4t2fJn-6bw+zTR1EU^&x7B1lk@nzJ4jG)_zcGM1KQ4=j=$;Uoyz?mmS zYMDP~hXMEDcHexybjL7quIKz$X?7YsDP8N7(gn8AbFME2nycnG(XRXcGC znUV|m9A3v~&>wc^V^~H!ggbE<+i(&2oa7QF@fxn>ela*r6Ql{N@HNzn25}Qkpg!>e zYRgXGZYj*o_&~2R)1X@n_u0{nF4Z@*cj7 z`i@p`FaGJdt;LO}FvI*s9KjIThtRc{0^B`$h?gzJbuMcwz6=UJ>FK9BqWWCcU`H)`Go-ufE;ndtcdR%0+u z|8)>%LK8$$JCH!VVA$K3LMY57AG&gzND*F5s7_g*Wo$y@fll78g-}Z6~o0 zZ?ti{Rv2zCeO~ph&-Z%K=XZQkI_f_V2#s2K+Z?rx!`7@}rmR`pu*cIzV#Y35`Ak>w zetobu5%r=-B2|cXnfbBOubVHF2l{(n+SjwE*BI)3W8l^OeZ_@fWMizoxwWl1w#$gc zJ7e*t)>!d!a3I`#AZ<={8p)o%J%f58kxX_^W?QU6rfY4|%x7lJOuEx3)`xzph_$r0 zw3Qx)>dH>NGSFrQAXj>jyckTxf?^XBM8)|f7& W=hJ!n$I{&Y)vp$xEm_ff<^KVFYU6|e diff --git a/src/funding/locale/pl/LC_MESSAGES/django.po b/src/funding/locale/pl/LC_MESSAGES/django.po index bf3a62e03..d55735536 100644 --- a/src/funding/locale/pl/LC_MESSAGES/django.po +++ b/src/funding/locale/pl/LC_MESSAGES/django.po @@ -5,18 +5,18 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-04-16 13:13+0100\n" +"PO-Revision-Date: 2021-06-10 14:06+0200\n" "Last-Translator: Radek Czajka \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 2.4.1\n" +"Language-Team: \n" #: funding/admin.py:27 msgid "payment complete" @@ -53,14 +53,12 @@ msgstr "E-mail kontaktowy" #: funding/forms.py:24 msgid "" -"We'll use it to contact you about the details needed for your perks,
and to send you updates about your payment and the fundraiser " +"We'll use it to send you updates about your payment and the fundraiser " "status (which you can always turn off).
Your e-mail won't be publicised." msgstr "" -"Użyjemy go do kontaktu w sprawie danych potrzebnych do realizacji " -"prezentów
i do informowania Cię o zmianach statusu płatności i " -"zbiórki (z czego zawsze możesz zrezygnować).
Twój adres e-mail nie " -"będzie upubliczniony." +"Użyjemy go do informowania Cię o zmianach statusu płatności i zbiórki (z " +"czego zawsze możesz zrezygnować).
Twój adres e-mail nie będzie " +"upubliczniony." #: funding/forms.py:43 #, python-format @@ -171,7 +169,7 @@ msgstr "prezent" msgid "email" msgstr "e-mail" -#: funding/models.py:273 funding/models.py:352 +#: funding/models.py:273 funding/models.py:355 msgid "amount" msgstr "kwota" @@ -192,19 +190,19 @@ msgstr "wpłata" msgid "fundings" msgstr "wpłaty" -#: funding/models.py:353 +#: funding/models.py:356 msgid "when" msgstr "kiedy" -#: funding/models.py:356 +#: funding/models.py:359 msgid "money spent on a book" msgstr "pieniądze wydane na książkę" -#: funding/models.py:357 +#: funding/models.py:360 msgid "money spent on books" msgstr "pieniądze wydane na książki" -#: funding/models.py:385 funding/templates/funding/thanks.html:6 +#: funding/models.py:388 funding/templates/funding/thanks.html:6 #: funding/templates/funding/thanks.html:13 msgid "Thank you for your support!" msgstr "Dziękujemy za Twoje wsparcie!" diff --git a/src/funding/locale/ru/LC_MESSAGES/django.po b/src/funding/locale/ru/LC_MESSAGES/django.po index e29fcfb7c..5e529378e 100644 --- a/src/funding/locale/ru/LC_MESSAGES/django.po +++ b/src/funding/locale/ru/LC_MESSAGES/django.po @@ -52,8 +52,7 @@ msgstr "" #: funding/forms.py:24 msgid "" -"We'll use it to contact you about the details needed for your perks,
and to send you updates about your payment and the fundraiser " +"We'll use it to send you updates about your payment and the fundraiser " "status (which you can always turn off).
Your e-mail won't be publicised." msgstr "" @@ -166,7 +165,7 @@ msgstr "" msgid "email" msgstr "" -#: funding/models.py:273 funding/models.py:352 +#: funding/models.py:273 funding/models.py:355 msgid "amount" msgstr "" @@ -187,19 +186,19 @@ msgstr "" msgid "fundings" msgstr "" -#: funding/models.py:353 +#: funding/models.py:356 msgid "when" msgstr "" -#: funding/models.py:356 +#: funding/models.py:359 msgid "money spent on a book" msgstr "" -#: funding/models.py:357 +#: funding/models.py:360 msgid "money spent on books" msgstr "" -#: funding/models.py:385 funding/templates/funding/thanks.html:6 +#: funding/models.py:388 funding/templates/funding/thanks.html:6 #: funding/templates/funding/thanks.html:13 msgid "Thank you for your support!" msgstr "" diff --git a/src/funding/locale/uk/LC_MESSAGES/django.po b/src/funding/locale/uk/LC_MESSAGES/django.po index e29fcfb7c..5e529378e 100644 --- a/src/funding/locale/uk/LC_MESSAGES/django.po +++ b/src/funding/locale/uk/LC_MESSAGES/django.po @@ -52,8 +52,7 @@ msgstr "" #: funding/forms.py:24 msgid "" -"We'll use it to contact you about the details needed for your perks,
and to send you updates about your payment and the fundraiser " +"We'll use it to send you updates about your payment and the fundraiser " "status (which you can always turn off).
Your e-mail won't be publicised." msgstr "" @@ -166,7 +165,7 @@ msgstr "" msgid "email" msgstr "" -#: funding/models.py:273 funding/models.py:352 +#: funding/models.py:273 funding/models.py:355 msgid "amount" msgstr "" @@ -187,19 +186,19 @@ msgstr "" msgid "fundings" msgstr "" -#: funding/models.py:353 +#: funding/models.py:356 msgid "when" msgstr "" -#: funding/models.py:356 +#: funding/models.py:359 msgid "money spent on a book" msgstr "" -#: funding/models.py:357 +#: funding/models.py:360 msgid "money spent on books" msgstr "" -#: funding/models.py:385 funding/templates/funding/thanks.html:6 +#: funding/models.py:388 funding/templates/funding/thanks.html:6 #: funding/templates/funding/thanks.html:13 msgid "Thank you for your support!" msgstr "" diff --git a/src/wolnelektury/templates/main_page.html b/src/wolnelektury/templates/main_page.html index f47e1d227..369d6f603 100644 --- a/src/wolnelektury/templates/main_page.html +++ b/src/wolnelektury/templates/main_page.html @@ -23,7 +23,7 @@ {{ book.mini_box }} {% endfor %} - +
{% trans "and many other books, poems, pictures, audiobooks…" %}
diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py index 2cc0fd799..5e56f5906 100644 --- a/src/wolnelektury/views.py +++ b/src/wolnelektury/views.py @@ -51,12 +51,16 @@ def main_page(request): best = [] best_places = 5 + recommended_collection = None for recommended in Collection.objects.filter(listed=True, role='recommend').order_by('?'): + if recommended_collection is None: + recommended_collection = recommended books = list(recommended.get_books().exclude(id__in=[b.id for b in best]).order_by('?')[:best_places]) best.extend(books) best_places -= len(books) if not best_places: break + ctx['recommended_collection'] = recommended_collection if best_places: best.extend( list( -- 2.20.1