From f1d9b67c3810c44b161689d94c1358dd7268dc91 Mon Sep 17 00:00:00 2001
From: Radek Czajka
Date: Wed, 7 Aug 2013 12:38:10 +0200
Subject: [PATCH 1/1] Info about funders.
---
.../catalogue/locale/pl/LC_MESSAGES/django.mo | Bin 11414 -> 11491 bytes
.../catalogue/locale/pl/LC_MESSAGES/django.po | 49 +++++++++++-------
.../templates/catalogue/book_info.html | 6 +++
lib/librarian | 2 +-
4 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo
index 62671f11663db70a45c35272ade1e88c2a31b7f4..84fe166d6d194fcc94fce412eaeccd2451de1005 100644
GIT binary patch
delta 3220
zcmY+_3rv+|9LMoTL4Mp$D^Z3eLa`Y`}E<
z4v%Bx!|wBEkbI8$hDIbeE@2p6$3EDGJ+Tv$(f5ck{V)^z;vCd~mf>uyM=!RZ26)|`
zwt|{p}tDk8SVEXT2^
zgdd~U@E~dv9kvFo=THM^Ma}f8z5WxbqId26PE^NXtgEg&F*NjIKh%hmP#ujzb(D$P
zY!gvSG7G7mDM59#0<|gEqVjC9_XDW+_M@Kr0+shTY5*tPbH`kup^;p&H*TQT?2h|@
zxra*dz+Uef?aRu^Su}uHYhTp$0jLgBQ8S#0`WgyQ&llk^tiYkT8&fcddcFfyxlUxYOhl6V
zISxckbbONIHs*4HPuwg+eV-dqCESZD)hG7+Bx(k&sNaV+d;LCYrk;VuJdG)+C9FjD
zovBCdf!(P04x#d&c4(+{-=mh|jX`XA}|A0k#WeoCI{QP7_%JJ!Mw-aMAfJn
zuSCXTHlsQ|h%ez+sJtUtFYTR793Z!5gThzKuS8|6#-34tk>=OvLUu4Ebp=>FC8Ad%plxnNoYb64h~?
zz3!kYu^yFY2Wo)(P!)L(!|;%9AAN=>;LyTJHZS1-88qhZ1kv^EFs$+lAH@xX8ArVm^_gbkEax!`{%Y(h(q{LoN5eF#QA-
z5gUo+L=vGbsbevr?H@V#r_3#
zna#Oz-bl}w5hE>ce_%GFIb+(xS54pFz1x}E!{W2gzUS<{&f4c(Xq&ug
zvUf7hS7)?(;#T6A&+I5}jN%vVhZwVN*oy7(BI={7*bjXj%p!0A`Y{K`;a!-E)tHT+
z<8Hi+I)7Kk;C!C#rW47)ml%$Rusa^bu6Q1k(bviBHcZ1FI2M)AbS%bljK+Pa1P{66
zR^-Qi=2s5>f$cD@v#$5dGJ+kmA;?YHNK`@v7>`BR1!toY^N^hE71Vj#@n-x0mFRv{
zBIi-pUvc9dVnY?mMpbkK#&UK}FD`U`6yCydC-jtg3LWkJaMT4Qs0pW`N?nG!^D5MZuc0c^gj%o#
zS;JaUl{tsnx~r%gh@}iVuQzJFJ5cA1j;H>8=}crmcUXyBW9v{8HXuLto*UnTRMU>4
z7C4Ps;2J97XtJuoIMlPW6}3g%Q1iWy*|-M>?(^fQg-^Kgvu@n`la4aJj#{WA8?J@oQ4d*9
z)Ry!|s%9fl3l*Xs#wn--O5NvkP}i+QomYdJw;q+iW_SD!lAvch+y@_{_UwQ=;UH>)
zBX0ahH+~AW;A!Vs)Oi=&=T}g7{twnsdVhl1?Hq4mKlE_#Lv3jb_S5@+f{rF^$G3~_
zJR0+{D`w(!OvgIZH`rd(`73$HG~qhb9oM49HzUQgH;^2x858k)WS8wSYRhALQ9-@`
zsdN@&HmXG1Q4=?z?rb;eg8it(PN5b`PYflTh1!bYsI3}OUT4*S$qllsm^-edj#_vXD)Sl~i*Ms_ynx!0fqg?04ndW?
z059TH)K*SN2{{#c{;V7yMz5MqJ341D0)ItS;u3PLh4VnPg|P*wj60@cS%QVJT{Xa#Ug!
zZhS3jz76QdI^s3Hau^NCT!%Y^$o11M@DTD@vJ(urvr1NlX9nr
z4(vtLzG;u=5(|hygxW;n9zuECPs9?{fdkRKya(y&yKFMihnPy-OX!h%l<*O22(@~m
zAlM82CDDtgR!XE28+1ThNz4iM%pP+t!&$DMj}H+U+W$xBtaTscIA6jT*Uvog95(Js
MD2!~(=+hYaFX2`xN&o-=
diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.po b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
index a2d12acae..dc508970f 100644
--- a/apps/catalogue/locale/pl/LC_MESSAGES/django.po
+++ b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-19 14:10+0200\n"
-"PO-Revision-Date: 2013-06-19 14:10+0100\n"
+"POT-Creation-Date: 2013-08-07 12:31+0200\n"
+"PO-Revision-Date: 2013-08-07 12:32+0100\n"
"Last-Translator: Radek Czajka \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -98,7 +98,7 @@ msgstr "BÅÄ
d podczas importowania pliku: %r"
msgid "Download custom PDF"
msgstr "Stwórz wÅasny PDF"
-#: views.py:557 templates/catalogue/book_short.html:92
+#: views.py:557 templates/catalogue/book_short.html:96
#: templates/catalogue/book_text.html:27 templates/catalogue/book_wide.html:63
msgid "Download"
msgstr "Pobierz"
@@ -272,7 +272,7 @@ msgstr ""
"Możecie z niej korzystaÄ bezpÅatnie i bez ograniczeÅ.\n"
"Audiobooki nagrywajÄ
znani aktorzy, wÅród nich Danuta Stenka i Jan Peszek."
-#: templates/catalogue/book_detail.html:20
+#: templates/catalogue/book_detail.html:21
#: templates/catalogue/tagged_object_list.html:74
#: templates/catalogue/tagged_object_list.html:104
msgid "See also"
@@ -320,6 +320,10 @@ msgid "Edited and annotated by:"
msgstr "Opracowanie redakcyjne i przypisy:"
#: templates/catalogue/book_info.html:33
+msgid "Publication funded by:"
+msgstr "PublikacjÄ ufundowali i ufundowaÅy:"
+
+#: templates/catalogue/book_info.html:41
msgid "Cover image by:"
msgstr "Ilustracja na okÅadce:"
@@ -331,53 +335,53 @@ msgstr "Spis wszystkich utworów"
msgid "Table of Content"
msgstr "Spis treÅci"
-#: templates/catalogue/book_list.html:30
+#: templates/catalogue/book_list.html:31
msgid "â top â"
msgstr "â góra â"
-#: templates/catalogue/book_short.html:59
+#: templates/catalogue/book_short.html:61
#: templates/catalogue/picture_detail.html:54
msgid "Epoch"
msgstr "Epoka"
-#: templates/catalogue/book_short.html:66
+#: templates/catalogue/book_short.html:69
#: templates/catalogue/picture_detail.html:60
msgid "Kind"
msgstr "Rodzaj"
-#: templates/catalogue/book_short.html:73
+#: templates/catalogue/book_short.html:77
msgid "Genre"
msgstr "Gatunek"
-#: templates/catalogue/book_short.html:88
+#: templates/catalogue/book_short.html:92
msgid "Read online"
msgstr "Czytaj online"
-#: templates/catalogue/book_short.html:95
+#: templates/catalogue/book_short.html:99
#: templates/catalogue/book_text.html:40
msgid "to print"
msgstr "do druku"
-#: templates/catalogue/book_short.html:98
+#: templates/catalogue/book_short.html:102
msgid "for an e-book reader"
msgstr "na czytnik e-booków"
-#: templates/catalogue/book_short.html:101
+#: templates/catalogue/book_short.html:105
#: templates/catalogue/book_text.html:46
msgid "for Kindle"
msgstr "na Kindle"
-#: templates/catalogue/book_short.html:104
+#: templates/catalogue/book_short.html:108
#: templates/catalogue/book_text.html:49
msgid "FictionBook"
msgstr "FictionBook"
-#: templates/catalogue/book_short.html:107
+#: templates/catalogue/book_short.html:111
#: templates/catalogue/book_text.html:52
msgid "for advanced usage"
msgstr "do zadaÅ specjalnych"
-#: templates/catalogue/book_short.html:113
+#: templates/catalogue/book_short.html:117
#: templates/catalogue/book_text.html:30
msgid "Listen"
msgstr "SÅuchaj"
@@ -456,6 +460,7 @@ msgid "Mix this book"
msgstr "Miksuj treÅÄ utworu"
#: templates/catalogue/catalogue.html:6 templates/catalogue/catalogue.html:11
+#: templates/catalogue/menu.html:5
msgid "Catalogue"
msgstr "Katalog"
@@ -495,7 +500,7 @@ msgstr "Epoki"
msgid "Themes and topics"
msgstr "Motywy i tematy"
-#: templates/catalogue/catalogue.html:34 templates/catalogue/menu.html:16
+#: templates/catalogue/catalogue.html:34 templates/catalogue/menu.html:20
msgid "Collections"
msgstr "Kolekcje"
@@ -539,19 +544,23 @@ msgstr "ZwiÅ fragment"
msgid "See full category"
msgstr "Zobacz caÅÄ
kategoriÄ"
-#: templates/catalogue/menu.html:9 templates/catalogue/menu.html.py:18
+#: templates/catalogue/menu.html:4
+msgid "Catalogue of the library"
+msgstr ""
+
+#: templates/catalogue/menu.html:13 templates/catalogue/menu.html.py:22
msgid "Please waitâ¦"
msgstr "ProszÄ czekaÄâ¦"
-#: templates/catalogue/menu.html:24
+#: templates/catalogue/menu.html:28
msgid "All books"
msgstr "Wszystkie utwory"
-#: templates/catalogue/menu.html:28
+#: templates/catalogue/menu.html:32
msgid "Audiobooks"
msgstr "Audiobooki"
-#: templates/catalogue/menu.html:32
+#: templates/catalogue/menu.html:36
msgid "DAISY"
msgstr "DAISY"
diff --git a/apps/catalogue/templates/catalogue/book_info.html b/apps/catalogue/templates/catalogue/book_info.html
index c5006f1ed..a90ccdc87 100755
--- a/apps/catalogue/templates/catalogue/book_info.html
+++ b/apps/catalogue/templates/catalogue/book_info.html
@@ -29,6 +29,12 @@
{% all_editors book.extra_info %}.
{% endif %}
+{% if book.extra_info.funders %}
+ {% trans "Publication funded by:" %}
+ {% for funder in book.extra_info.funders %}{{ funder }}{% if not forloop.last %}, {% else %}.{% endif %}{% endfor %}
+
+{% endif %}
+
{% if book.extra_info.cover_by %}
{% trans "Cover image by:" %}
diff --git a/lib/librarian b/lib/librarian
index b56beb67f..547cb2feb 160000
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit b56beb67ff25d7a6ae42c841b9f10e681a748e22
+Subproject commit 547cb2febc3c9350fed0267dbcecd52768c83916
--
2.20.1