fnp
/
wolnelektury.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
689dab7
)
Collection link on main and slight funding wording change.
author
Radek Czajka
<rczajka@rczajka.pl>
Thu, 10 Jun 2021 12:08:11 +0000
(14:08 +0200)
committer
Radek Czajka
<rczajka@rczajka.pl>
Thu, 10 Jun 2021 12:08:11 +0000
(14:08 +0200)
13 files changed:
src/funding/forms.py
patch
|
blob
|
history
src/funding/locale/de/LC_MESSAGES/django.po
patch
|
blob
|
history
src/funding/locale/en/LC_MESSAGES/django.po
patch
|
blob
|
history
src/funding/locale/es/LC_MESSAGES/django.po
patch
|
blob
|
history
src/funding/locale/fr/LC_MESSAGES/django.po
patch
|
blob
|
history
src/funding/locale/it/LC_MESSAGES/django.po
patch
|
blob
|
history
src/funding/locale/lt/LC_MESSAGES/django.po
patch
|
blob
|
history
src/funding/locale/pl/LC_MESSAGES/django.mo
patch
|
blob
|
history
src/funding/locale/pl/LC_MESSAGES/django.po
patch
|
blob
|
history
src/funding/locale/ru/LC_MESSAGES/django.po
patch
|
blob
|
history
src/funding/locale/uk/LC_MESSAGES/django.po
patch
|
blob
|
history
src/wolnelektury/templates/main_page.html
patch
|
blob
|
history
src/wolnelektury/views.py
patch
|
blob
|
history
diff --git
a/src/funding/forms.py
b/src/funding/forms.py
index
c3661d5
..
ef79774
100644
(file)
--- 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(_(
email = forms.EmailField(
label=_("Contact e-mail"),
help_text=mark_safe(_(
- "We'll use it to
contact you about the <strong>details needed for your perks</strong>,<br/>
"
- "
and to
send you updates about your payment and the fundraiser status (which you can always turn off).<br/>"
+ "We'll use it to "
+ "send you updates about your payment and the fundraiser status (which you can always turn off).<br/>"
"Your e-mail won't be publicised.")), required=False)
data_processing_part2 = '''\
"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
475cf33
..
81d737d
100644
(file)
--- 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 ""
#: funding/forms.py:24
msgid ""
-"We'll use it to contact you about the <strong>details needed for your perks</"
-"strong>,<br/>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).<br/>Your e-mail won't be publicised."
msgstr ""
"status (which you can always turn off).<br/>Your e-mail won't be publicised."
msgstr ""
@@
-165,7
+164,7
@@
msgstr ""
msgid "email"
msgstr ""
msgid "email"
msgstr ""
-#: funding/models.py:273 funding/models.py:35
2
+#: funding/models.py:273 funding/models.py:35
5
msgid "amount"
msgstr ""
msgid "amount"
msgstr ""
@@
-186,19
+185,19
@@
msgstr ""
msgid "fundings"
msgstr ""
msgid "fundings"
msgstr ""
-#: funding/models.py:35
3
+#: funding/models.py:35
6
msgid "when"
msgstr ""
msgid "when"
msgstr ""
-#: funding/models.py:35
6
+#: funding/models.py:35
9
msgid "money spent on a book"
msgstr ""
msgid "money spent on a book"
msgstr ""
-#: funding/models.py:3
57
+#: funding/models.py:3
60
msgid "money spent on books"
msgstr ""
msgid "money spent on books"
msgstr ""
-#: funding/models.py:38
5
funding/templates/funding/thanks.html:6
+#: funding/models.py:38
8
funding/templates/funding/thanks.html:6
#: funding/templates/funding/thanks.html:13
msgid "Thank you for your support!"
msgstr ""
#: 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
7ce9bd3
..
50bea65
100644
(file)
--- 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 ""
#: funding/forms.py:24
msgid ""
-"We'll use it to contact you about the <strong>details needed for your perks</"
-"strong>,<br/>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).<br/>Your e-mail won't be publicised."
msgstr ""
"status (which you can always turn off).<br/>Your e-mail won't be publicised."
msgstr ""
@@
-164,7
+163,7
@@
msgstr ""
msgid "email"
msgstr ""
msgid "email"
msgstr ""
-#: funding/models.py:273 funding/models.py:35
2
+#: funding/models.py:273 funding/models.py:35
5
msgid "amount"
msgstr ""
msgid "amount"
msgstr ""
@@
-185,19
+184,19
@@
msgstr ""
msgid "fundings"
msgstr ""
msgid "fundings"
msgstr ""
-#: funding/models.py:35
3
+#: funding/models.py:35
6
msgid "when"
msgstr ""
msgid "when"
msgstr ""
-#: funding/models.py:35
6
+#: funding/models.py:35
9
msgid "money spent on a book"
msgstr ""
msgid "money spent on a book"
msgstr ""
-#: funding/models.py:3
57
+#: funding/models.py:3
60
msgid "money spent on books"
msgstr ""
msgid "money spent on books"
msgstr ""
-#: funding/models.py:38
5
funding/templates/funding/thanks.html:6
+#: funding/models.py:38
8
funding/templates/funding/thanks.html:6
#: funding/templates/funding/thanks.html:13
msgid "Thank you for your support!"
msgstr ""
#: 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
475cf33
..
81d737d
100644
(file)
--- 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 ""
#: funding/forms.py:24
msgid ""
-"We'll use it to contact you about the <strong>details needed for your perks</"
-"strong>,<br/>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).<br/>Your e-mail won't be publicised."
msgstr ""
"status (which you can always turn off).<br/>Your e-mail won't be publicised."
msgstr ""
@@
-165,7
+164,7
@@
msgstr ""
msgid "email"
msgstr ""
msgid "email"
msgstr ""
-#: funding/models.py:273 funding/models.py:35
2
+#: funding/models.py:273 funding/models.py:35
5
msgid "amount"
msgstr ""
msgid "amount"
msgstr ""
@@
-186,19
+185,19
@@
msgstr ""
msgid "fundings"
msgstr ""
msgid "fundings"
msgstr ""
-#: funding/models.py:35
3
+#: funding/models.py:35
6
msgid "when"
msgstr ""
msgid "when"
msgstr ""
-#: funding/models.py:35
6
+#: funding/models.py:35
9
msgid "money spent on a book"
msgstr ""
msgid "money spent on a book"
msgstr ""
-#: funding/models.py:3
57
+#: funding/models.py:3
60
msgid "money spent on books"
msgstr ""
msgid "money spent on books"
msgstr ""
-#: funding/models.py:38
5
funding/templates/funding/thanks.html:6
+#: funding/models.py:38
8
funding/templates/funding/thanks.html:6
#: funding/templates/funding/thanks.html:13
msgid "Thank you for your support!"
msgstr ""
#: 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
41a23c7
..
d69574c
100644
(file)
--- 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 ""
#: funding/forms.py:24
msgid ""
-"We'll use it to contact you about the <strong>details needed for your perks</"
-"strong>,<br/>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).<br/>Your e-mail won't be publicised."
msgstr ""
"status (which you can always turn off).<br/>Your e-mail won't be publicised."
msgstr ""
@@
-165,7
+164,7
@@
msgstr ""
msgid "email"
msgstr ""
msgid "email"
msgstr ""
-#: funding/models.py:273 funding/models.py:35
2
+#: funding/models.py:273 funding/models.py:35
5
msgid "amount"
msgstr ""
msgid "amount"
msgstr ""
@@
-186,19
+185,19
@@
msgstr ""
msgid "fundings"
msgstr ""
msgid "fundings"
msgstr ""
-#: funding/models.py:35
3
+#: funding/models.py:35
6
msgid "when"
msgstr ""
msgid "when"
msgstr ""
-#: funding/models.py:35
6
+#: funding/models.py:35
9
msgid "money spent on a book"
msgstr ""
msgid "money spent on a book"
msgstr ""
-#: funding/models.py:3
57
+#: funding/models.py:3
60
msgid "money spent on books"
msgstr ""
msgid "money spent on books"
msgstr ""
-#: funding/models.py:38
5
funding/templates/funding/thanks.html:6
+#: funding/models.py:38
8
funding/templates/funding/thanks.html:6
#: funding/templates/funding/thanks.html:13
msgid "Thank you for your support!"
msgstr ""
#: 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
475cf33
..
81d737d
100644
(file)
--- 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 ""
#: funding/forms.py:24
msgid ""
-"We'll use it to contact you about the <strong>details needed for your perks</"
-"strong>,<br/>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).<br/>Your e-mail won't be publicised."
msgstr ""
"status (which you can always turn off).<br/>Your e-mail won't be publicised."
msgstr ""
@@
-165,7
+164,7
@@
msgstr ""
msgid "email"
msgstr ""
msgid "email"
msgstr ""
-#: funding/models.py:273 funding/models.py:35
2
+#: funding/models.py:273 funding/models.py:35
5
msgid "amount"
msgstr ""
msgid "amount"
msgstr ""
@@
-186,19
+185,19
@@
msgstr ""
msgid "fundings"
msgstr ""
msgid "fundings"
msgstr ""
-#: funding/models.py:35
3
+#: funding/models.py:35
6
msgid "when"
msgstr ""
msgid "when"
msgstr ""
-#: funding/models.py:35
6
+#: funding/models.py:35
9
msgid "money spent on a book"
msgstr ""
msgid "money spent on a book"
msgstr ""
-#: funding/models.py:3
57
+#: funding/models.py:3
60
msgid "money spent on books"
msgstr ""
msgid "money spent on books"
msgstr ""
-#: funding/models.py:38
5
funding/templates/funding/thanks.html:6
+#: funding/models.py:38
8
funding/templates/funding/thanks.html:6
#: funding/templates/funding/thanks.html:13
msgid "Thank you for your support!"
msgstr ""
#: 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
10a3d20
..
17e8666
100644
(file)
--- 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 ""
#: funding/forms.py:24
msgid ""
-"We'll use it to contact you about the <strong>details needed for your perks</"
-"strong>,<br/>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).<br/>Your e-mail won't be publicised."
msgstr ""
"status (which you can always turn off).<br/>Your e-mail won't be publicised."
msgstr ""
@@
-166,7
+165,7
@@
msgstr ""
msgid "email"
msgstr ""
msgid "email"
msgstr ""
-#: funding/models.py:273 funding/models.py:35
2
+#: funding/models.py:273 funding/models.py:35
5
msgid "amount"
msgstr ""
msgid "amount"
msgstr ""
@@
-187,19
+186,19
@@
msgstr ""
msgid "fundings"
msgstr ""
msgid "fundings"
msgstr ""
-#: funding/models.py:35
3
+#: funding/models.py:35
6
msgid "when"
msgstr ""
msgid "when"
msgstr ""
-#: funding/models.py:35
6
+#: funding/models.py:35
9
msgid "money spent on a book"
msgstr ""
msgid "money spent on a book"
msgstr ""
-#: funding/models.py:3
57
+#: funding/models.py:3
60
msgid "money spent on books"
msgstr ""
msgid "money spent on books"
msgstr ""
-#: funding/models.py:38
5
funding/templates/funding/thanks.html:6
+#: funding/models.py:38
8
funding/templates/funding/thanks.html:6
#: funding/templates/funding/thanks.html:13
msgid "Thank you for your support!"
msgstr ""
#: 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
85a86dc
..
99760e1
100644
(file)
Binary files a/src/funding/locale/pl/LC_MESSAGES/django.mo and b/src/funding/locale/pl/LC_MESSAGES/django.mo differ
diff --git
a/src/funding/locale/pl/LC_MESSAGES/django.po
b/src/funding/locale/pl/LC_MESSAGES/django.po
index
bf3a62e
..
d557355
100644
(file)
--- a/
src/funding/locale/pl/LC_MESSAGES/django.po
+++ b/
src/funding/locale/pl/LC_MESSAGES/django.po
@@
-5,18
+5,18
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version:
PACKAGE VERSION
\n"
+"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 20
15-04-16 13:13+01
00\n"
+"PO-Revision-Date: 20
21-06-10 14:06+02
00\n"
"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
"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"
#: funding/admin.py:27
msgid "payment complete"
@@
-53,14
+53,12
@@
msgstr "E-mail kontaktowy"
#: funding/forms.py:24
msgid ""
#: funding/forms.py:24
msgid ""
-"We'll use it to contact you about the <strong>details needed for your perks</"
-"strong>,<br/>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).<br/>Your e-mail won't be publicised."
msgstr ""
"status (which you can always turn off).<br/>Your e-mail won't be publicised."
msgstr ""
-"Użyjemy go do kontaktu w sprawie <strong>danych potrzebnych do realizacji "
-"prezentów</strong><br/>i do informowania Cię o zmianach statusu płatności i "
-"zbiórki (z czego zawsze możesz zrezygnować).<br/>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ć).<br/>Twój adres e-mail nie będzie "
+"upubliczniony."
#: funding/forms.py:43
#, python-format
#: funding/forms.py:43
#, python-format
@@
-171,7
+169,7
@@
msgstr "prezent"
msgid "email"
msgstr "e-mail"
msgid "email"
msgstr "e-mail"
-#: funding/models.py:273 funding/models.py:35
2
+#: funding/models.py:273 funding/models.py:35
5
msgid "amount"
msgstr "kwota"
msgid "amount"
msgstr "kwota"
@@
-192,19
+190,19
@@
msgstr "wpłata"
msgid "fundings"
msgstr "wpłaty"
msgid "fundings"
msgstr "wpłaty"
-#: funding/models.py:35
3
+#: funding/models.py:35
6
msgid "when"
msgstr "kiedy"
msgid "when"
msgstr "kiedy"
-#: funding/models.py:35
6
+#: funding/models.py:35
9
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ę"
-#: funding/models.py:3
57
+#: funding/models.py:3
60
msgid "money spent on books"
msgstr "pieniądze wydane na książki"
msgid "money spent on books"
msgstr "pieniądze wydane na książki"
-#: funding/models.py:38
5
funding/templates/funding/thanks.html:6
+#: funding/models.py:38
8
funding/templates/funding/thanks.html:6
#: funding/templates/funding/thanks.html:13
msgid "Thank you for your support!"
msgstr "Dziękujemy za Twoje wsparcie!"
#: 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
e29fcfb
..
5e52937
100644
(file)
--- 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 ""
#: funding/forms.py:24
msgid ""
-"We'll use it to contact you about the <strong>details needed for your perks</"
-"strong>,<br/>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).<br/>Your e-mail won't be publicised."
msgstr ""
"status (which you can always turn off).<br/>Your e-mail won't be publicised."
msgstr ""
@@
-166,7
+165,7
@@
msgstr ""
msgid "email"
msgstr ""
msgid "email"
msgstr ""
-#: funding/models.py:273 funding/models.py:35
2
+#: funding/models.py:273 funding/models.py:35
5
msgid "amount"
msgstr ""
msgid "amount"
msgstr ""
@@
-187,19
+186,19
@@
msgstr ""
msgid "fundings"
msgstr ""
msgid "fundings"
msgstr ""
-#: funding/models.py:35
3
+#: funding/models.py:35
6
msgid "when"
msgstr ""
msgid "when"
msgstr ""
-#: funding/models.py:35
6
+#: funding/models.py:35
9
msgid "money spent on a book"
msgstr ""
msgid "money spent on a book"
msgstr ""
-#: funding/models.py:3
57
+#: funding/models.py:3
60
msgid "money spent on books"
msgstr ""
msgid "money spent on books"
msgstr ""
-#: funding/models.py:38
5
funding/templates/funding/thanks.html:6
+#: funding/models.py:38
8
funding/templates/funding/thanks.html:6
#: funding/templates/funding/thanks.html:13
msgid "Thank you for your support!"
msgstr ""
#: 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
e29fcfb
..
5e52937
100644
(file)
--- 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 ""
#: funding/forms.py:24
msgid ""
-"We'll use it to contact you about the <strong>details needed for your perks</"
-"strong>,<br/>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).<br/>Your e-mail won't be publicised."
msgstr ""
"status (which you can always turn off).<br/>Your e-mail won't be publicised."
msgstr ""
@@
-166,7
+165,7
@@
msgstr ""
msgid "email"
msgstr ""
msgid "email"
msgstr ""
-#: funding/models.py:273 funding/models.py:35
2
+#: funding/models.py:273 funding/models.py:35
5
msgid "amount"
msgstr ""
msgid "amount"
msgstr ""
@@
-187,19
+186,19
@@
msgstr ""
msgid "fundings"
msgstr ""
msgid "fundings"
msgstr ""
-#: funding/models.py:35
3
+#: funding/models.py:35
6
msgid "when"
msgstr ""
msgid "when"
msgstr ""
-#: funding/models.py:35
6
+#: funding/models.py:35
9
msgid "money spent on a book"
msgstr ""
msgid "money spent on a book"
msgstr ""
-#: funding/models.py:3
57
+#: funding/models.py:3
60
msgid "money spent on books"
msgstr ""
msgid "money spent on books"
msgstr ""
-#: funding/models.py:38
5
funding/templates/funding/thanks.html:6
+#: funding/models.py:38
8
funding/templates/funding/thanks.html:6
#: funding/templates/funding/thanks.html:13
msgid "Thank you for your support!"
msgstr ""
#: 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
f47e1d2
..
369d6f6
100644
(file)
--- a/
src/wolnelektury/templates/main_page.html
+++ b/
src/wolnelektury/templates/main_page.html
@@
-23,7
+23,7
@@
{{ book.mini_box }}
{% endfor %}
</div>
{{ book.mini_box }}
{% endfor %}
</div>
-
<a href="{% url "book_list"
%}">
+
<a href="{% if recommended_collection %}{{ recommended_collection.get_absolute_url }}{% else %}{% url "book_list" %}{% endif
%}">
<div class="note white-box normal-text" style="font-size: 18px">
{% trans "and many other books, poems, pictures, audiobooks…" %}
</div>
<div class="note white-box normal-text" style="font-size: 18px">
{% trans "and many other books, poems, pictures, audiobooks…" %}
</div>
diff --git
a/src/wolnelektury/views.py
b/src/wolnelektury/views.py
index
2cc0fd7
..
5e56f59
100644
(file)
--- a/
src/wolnelektury/views.py
+++ b/
src/wolnelektury/views.py
@@
-51,12
+51,16
@@
def main_page(request):
best = []
best_places = 5
best = []
best_places = 5
+ recommended_collection = None
for recommended in Collection.objects.filter(listed=True, role='recommend').order_by('?'):
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
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(
if best_places:
best.extend(
list(