free art license icon

diff --git a/src/catalogue/constants.py b/src/catalogue/constants.py
index f592c71..e6773d0 100644 (file)
--- a/src/catalogue/constants.py
+++ b/src/catalogue/constants.py
@@ -9,6 +9,10 @@ LICENSES = {
         'icon': 'cc-by-sa',
         'description': _('Creative Commons Attribution-ShareAlike 3.0 Unported'),
     },
         'icon': 'cc-by-sa',
         'description': _('Creative Commons Attribution-ShareAlike 3.0 Unported'),
     },

+    'http://artlibre.org/licence/lal/pl/': {
+        'icon': 'lal',
+        'description': _('Free Art License 1.3'),
+    }

 }
 LICENSES['http://creativecommons.org/licenses/by-sa/3.0/deed.pl'] = \
     LICENSES['http://creativecommons.org/licenses/by-sa/3.0/']
 }
 LICENSES['http://creativecommons.org/licenses/by-sa/3.0/deed.pl'] = \
     LICENSES['http://creativecommons.org/licenses/by-sa/3.0/']

diff --git a/src/catalogue/locale/pl/LC_MESSAGES/django.po b/src/catalogue/locale/pl/LC_MESSAGES/django.po
index d97e61a..f08080d 100644 (file)
--- a/src/catalogue/locale/pl/LC_MESSAGES/django.po
+++ b/src/catalogue/locale/pl/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WolneLektury\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: WolneLektury\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2017-06-02 15:44+0200\n"
+"POT-Creation-Date: 2017-08-18 17:32+0200\n"

 "PO-Revision-Date: 2015-12-31 16:45+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
 "PO-Revision-Date: 2015-12-31 16:45+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."


@@ -24,59 +24,63 @@ msgid "Creative Commons Attribution-ShareAlike 3.0 Unported"
 msgstr ""
 "Creative Commons Uznanie autorstwa – Na tych samych warunkach 3.0 Unported"
 
 msgstr ""
 "Creative Commons Uznanie autorstwa – Na tych samych warunkach 3.0 Unported"
 

-#: constants.py:41
+#: constants.py:14
+msgid "Free Art License 1.3"
+msgstr "Licencja Wolnej Sztuki 1.3"
+
+#: constants.py:45

 msgid "authors"
 msgstr "autorzy"
 
 msgid "authors"
 msgstr "autorzy"
 

-#: constants.py:42
+#: constants.py:46

 msgid "epochs"
 msgstr "epoki"
 
 msgid "epochs"
 msgstr "epoki"
 

-#: constants.py:43
+#: constants.py:47

 msgid "kinds"
 msgstr "rodzaje"
 
 msgid "kinds"
 msgstr "rodzaje"
 

-#: constants.py:44
+#: constants.py:48

 msgid "genres"
 msgstr "gatunki"
 
 msgid "genres"
 msgstr "gatunki"
 

-#: constants.py:45
+#: constants.py:49

 msgid "themes"
 msgstr "motywy"
 
 msgid "themes"
 msgstr "motywy"
 

-#: constants.py:46
+#: constants.py:50

 msgid "sets"
 msgstr "półki"
 
 msgid "sets"
 msgstr "półki"
 

-#: constants.py:47
+#: constants.py:51

 msgid "things"
 msgstr "przedmioty"
 
 msgid "things"
 msgstr "przedmioty"
 

-#: constants.py:51
+#: constants.py:55

 msgid "All authors"
 msgstr "Wszyscy autorzy"
 
 msgid "All authors"
 msgstr "Wszyscy autorzy"
 

-#: constants.py:52
+#: constants.py:56

 msgid "All epochs"
 msgstr "Wszystkie epoki"
 
 msgid "All epochs"
 msgstr "Wszystkie epoki"
 

-#: constants.py:53
+#: constants.py:57

 msgid "All kinds"
 msgstr "Wszystkie rodzaje"
 
 msgid "All kinds"
 msgstr "Wszystkie rodzaje"
 

-#: constants.py:54
+#: constants.py:58

 msgid "All genres"
 msgstr "Wszystkie gatunki"
 
 msgid "All genres"
 msgstr "Wszystkie gatunki"
 

-#: constants.py:55
+#: constants.py:59

 msgid "All themes"
 msgstr "Wszystkie motywy"
 
 msgid "All themes"
 msgstr "Wszystkie motywy"
 

-#: constants.py:56
+#: constants.py:60

 msgid "All sets"
 msgstr "Wszystkie półki"
 
 msgid "All sets"
 msgstr "Wszystkie półki"
 

-#: constants.py:57
+#: constants.py:61

 msgid "All things"
 msgstr "Wszystkie przedmioty"
 
 msgid "All things"
 msgstr "Wszystkie przedmioty"
 


@@ -136,7 +140,7 @@ msgstr "Kolejka jest pełna. Proszę spróbować ponownie później."
 msgid "title"
 msgstr "tytuł"
 
 msgid "title"
 msgstr "tytuł"
 

-#: models/book.py:50 models/tag.py:37
+#: models/book.py:50 models/tag.py:58

 msgid "sort key"
 msgstr "klucz sortowania"
 
 msgid "sort key"
 msgstr "klucz sortowania"
 


@@ -145,7 +149,7 @@ msgid "sort key by author"
 msgstr "klucz sortowania wg autora"
 
 #: models/book.py:53 models/book.py:54 models/collection.py:15
 msgstr "klucz sortowania wg autora"
 
 #: models/book.py:53 models/book.py:54 models/collection.py:15

-#: models/collection.py:18 models/tag.py:36
+#: models/collection.py:18 models/tag.py:57

 msgid "slug"
 msgstr "slug"
 
 msgid "slug"
 msgstr "slug"
 


@@ -153,13 +157,13 @@ msgstr "slug"
 msgid "language code"
 msgstr "Kod języka"
 
 msgid "language code"
 msgstr "Kod języka"
 

-#: models/book.py:56 models/book.py:197 models/collection.py:16
-#: models/tag.py:40 models/tag.py:160
+#: models/book.py:56 models/book.py:208 models/collection.py:16
+#: models/tag.py:61 models/tag.py:183

 msgid "description"
 msgstr "opis"
 
 msgid "description"
 msgstr "opis"
 

-#: models/book.py:57 models/book.py:58 models/bookmedia.py:36 models/tag.py:47
-#: models/tag.py:48
+#: models/book.py:57 models/book.py:58 models/bookmedia.py:36 models/tag.py:68
+#: models/tag.py:69

 msgid "creation date"
 msgstr "data utworzenia"
 
 msgid "creation date"
 msgstr "data utworzenia"
 


@@ -191,21 +195,21 @@ msgstr "książka"
 msgid "books"
 msgstr "książki"
 
 msgid "books"
 msgstr "książki"
 

-#: models/book.py:308
+#: models/book.py:319

 #, python-format
 msgid "Book \"%s\" does not exist."
 msgstr "Utwór \"%s\" nie istnieje."
 
 #, python-format
 msgid "Book \"%s\" does not exist."
 msgstr "Utwór \"%s\" nie istnieje."
 

-#: models/book.py:321
+#: models/book.py:332

 #, python-format
 msgid "Book %s already exists"
 msgstr "Książka %s już istnieje"
 
 #, python-format
 msgid "Book %s already exists"
 msgstr "Książka %s już istnieje"
 

-#: models/book.py:578
+#: models/book.py:590

 msgid "This work needs modernisation"
 msgstr "Ten utwór wymaga uwspółcześnienia"
 
 msgid "This work needs modernisation"
 msgstr "Ten utwór wymaga uwspółcześnienia"
 

-#: models/book.py:618 models/bookmedia.py:29
+#: models/book.py:630 models/bookmedia.py:29

 #, python-format
 msgid "%s file"
 msgstr "plik %s"
 #, python-format
 msgid "%s file"
 msgstr "plik %s"


@@ -214,7 +218,7 @@ msgstr "plik %s"
 msgid "type"
 msgstr "typ"
 
 msgid "type"
 msgstr "typ"
 

-#: models/bookmedia.py:32 models/source.py:12 models/tag.py:35
+#: models/bookmedia.py:32 models/source.py:12 models/tag.py:56

 msgid "name"
 msgstr "nazwa"
 
 msgid "name"
 msgstr "nazwa"
 


@@ -238,7 +242,7 @@ msgstr "media książki"
 msgid "book slugs"
 msgstr "slugi utworów"
 
 msgid "book slugs"
 msgstr "slugi utworów"
 

-#: models/collection.py:21 models/tag.py:22
+#: models/collection.py:21 models/tag.py:25

 msgid "kind"
 msgstr "rodzaj"
 
 msgid "kind"
 msgstr "rodzaj"
 


@@ -274,39 +278,47 @@ msgstr "źródło"
 msgid "sources"
 msgstr "źródła"
 
 msgid "sources"
 msgstr "źródła"
 

-#: models/tag.py:20
+#: models/tag.py:23

 msgid "author"
 msgstr "autor"
 
 msgid "author"
 msgstr "autor"
 

-#: models/tag.py:21
+#: models/tag.py:24

 msgid "epoch"
 msgstr "epoka"
 
 msgid "epoch"
 msgstr "epoka"
 

-#: models/tag.py:23
+#: models/tag.py:26

 msgid "genre"
 msgstr "gatunek"
 
 msgid "genre"
 msgstr "gatunek"
 

-#: models/tag.py:24
+#: models/tag.py:27

 msgid "theme"
 msgstr "motyw"
 
 msgid "theme"
 msgstr "motyw"
 

-#: models/tag.py:25
+#: models/tag.py:28

 msgid "set"
 msgstr "półka"
 
 msgid "set"
 msgstr "półka"
 

-#: models/tag.py:26
+#: models/tag.py:29

 msgid "thing"
 msgstr "przedmiot"
 
 msgid "thing"
 msgstr "przedmiot"
 

-#: models/tag.py:39
-msgid "category"
-msgstr "kategoria"
-
-#: models/tag.py:70
+#: models/tag.py:35 models/tag.py:93

 msgid "tag"
 msgstr "tag"
 
 msgid "tag"
 msgstr "tag"
 

-#: models/tag.py:71
+#: models/tag.py:36
+msgid "content type"
+msgstr "typ treści"
+
+#: models/tag.py:37
+msgid "object id"
+msgstr "id obiektu"
+
+#: models/tag.py:60
+msgid "category"
+msgstr "kategoria"
+
+#: models/tag.py:94

 msgid "tags"
 msgstr "tagi"
 
 msgid "tags"
 msgstr "tagi"
 


@@ -436,33 +448,33 @@ msgstr "Spis treści"
 msgid "↑ top ↑"
 msgstr "↑ góra ↑"
 
 msgid "↑ top ↑"
 msgstr "↑ góra ↑"
 

-#: templates/catalogue/book_short.html:41
+#: templates/catalogue/book_short.html:46

 #: templates/catalogue/picture_detail.html:52
 msgid "Epoch"
 msgstr "Epoka"
 
 #: templates/catalogue/picture_detail.html:52
 msgid "Epoch"
 msgstr "Epoka"
 

-#: templates/catalogue/book_short.html:49
+#: templates/catalogue/book_short.html:54

 #: templates/catalogue/picture_detail.html:58
 msgid "Kind"
 msgstr "Rodzaj"
 
 #: templates/catalogue/picture_detail.html:58
 msgid "Kind"
 msgstr "Rodzaj"
 

-#: templates/catalogue/book_short.html:57
+#: templates/catalogue/book_short.html:62

 msgid "Genre"
 msgstr "Gatunek"
 
 msgid "Genre"
 msgstr "Gatunek"
 

-#: templates/catalogue/book_short.html:66
+#: templates/catalogue/book_short.html:71

 msgid "Language"
 msgstr "Język"
 
 msgid "Language"
 msgstr "Język"
 

-#: templates/catalogue/book_short.html:85
+#: templates/catalogue/book_short.html:90

 msgid "Read online"
 msgstr "Czytaj online"
 
 msgid "Read online"
 msgstr "Czytaj online"
 

-#: templates/catalogue/book_short.html:88
+#: templates/catalogue/book_short.html:93

 msgid "Print on demand"
 msgstr "Druk na żądanie"
 
 msgid "Print on demand"
 msgstr "Druk na żądanie"
 

-#: templates/catalogue/book_short.html:92
+#: templates/catalogue/book_short.html:97

 #: templates/catalogue/custom_pdf_form.html:19 views.py:630
 msgid "Download"
 msgstr "Pobierz"
 #: templates/catalogue/custom_pdf_form.html:19 views.py:630
 msgid "Download"
 msgstr "Pobierz"

diff --git a/src/wolnelektury/static/img/licenses/lal.png b/src/wolnelektury/static/img/licenses/lal.png
new file mode 100644 (file)
index 0000000..1d42298
Binary files /dev/null and b/src/wolnelektury/static/img/licenses/lal.png differ

diff --git a/src/wolnelektury/static/img/licenses/lal.svg b/src/wolnelektury/static/img/licenses/lal.svg
new file mode 100644 (file)
index 0000000..bb0c2bb
--- /dev/null
+++ b/src/wolnelektury/static/img/licenses/lal.svg
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="367.01"
+   version="1.1"
+   height="130"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="lal.svg"
+   inkscape:export-filename="/home/janek/Desktop/lal.png"
+   inkscape:export-xdpi="16.675295"
+   inkscape:export-ydpi="16.675295">
+  <metadata
+     id="metadata38">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview34"
+     showgrid="false"
+     inkscape:zoom="0.96727607"
+     inkscape:cx="183.505"
+     inkscape:cy="65"
+     inkscape:window-x="410"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <g
+     transform="translate(.0032973 -.00070122)"
+     id="g4">
+    <rect
+       style="color:#000000"
+       rx="27.857"
+       ry="29.286"
+       height="130"
+       width="330"
+       y=".00070122"
+       x="37.003"
+       fill="#d22830"
+       id="rect6" />
+    <rect
+       style="color:#000000"
+       rx="27.857"
+       ry="29.286"
+       height="130"
+       width="116.79"
+       y=".00265"
+       x="-.0032973"
+       fill="#127daf"
+       id="rect8" />
+  </g>
+  <g
+     transform="translate(.0032973 -.00070122)"
+     id="g10">
+    <path
+       style="block-progression:tb;text-indent:0;color:#000000;text-transform:none"
+       d="m58.406 16.5c-26.732 0-48.5 21.767-48.5 48.5s21.768 48.5 48.5 48.5 48.5-21.767 48.5-48.5-21.768-48.5-48.5-48.5zm0 9c21.869 0 39.5 17.631 39.5 39.5s-17.631 39.5-39.5 39.5-39.5-17.631-39.5-39.5 17.631-39.5 39.5-39.5zm0 7.3125c-8.4218 0-16.09 3.2687-21.844 8.5938v15.688c3.221-8.94 11.758-15.282 21.844-15.282 12.866 0 23.188 10.321 23.188 23.188s-10.321 23.188-23.188 23.188c-10.086 0-18.623-6.3419-21.844-15.281v15.688c5.7537 5.3251 13.422 8.5938 21.844 8.5938 17.73 0 32.188-14.457 32.188-32.188 0-17.73-14.457-32.188-32.188-32.188z"
+       fill="#FFF"
+       id="path12" />
+  </g>
+  <g
+     transform="translate(-402.91 -37.192)"
+     id="g14">
+    <path
+       transform="translate(402.91 37.192)"
+       d="m251 69.031c-1.8841 0-3.4062 1.478-3.4062 3.3125s1.5222 3.3125 3.4062 3.3125c1.8841 0 3.4375-1.478 3.4375-3.3125s-1.5534-3.3125-3.4375-3.3125zm-17.594 0.0625v45h5.75v-45h-5.75zm25.594 0-0.1875 44.812 6.0312-0.0937v-2.7812s4.9331 4.0238 11.781 3.375c6.8482-0.64879 15.028-5.1424 15.156-16.438 0.12865-11.295-9.8317-16.327-16.906-16.438-7.0746-0.11069-9.9375 3.5625-9.9375 3.5625l0.1-15.918-6.03-0.094zm-66.156 6.5625v6.2812h-4.2188v5.5625h4.2188v20.938c0.66462 2.7105 3.3645 5.358 6.1875 5.6562h7.2812v-6.125h-5.8438c-0.79257-0.0857-1.2927-0.45017-1.625-1.25v-19.219h7.4688v-5.5625h-7.4688l-0.0937-6.2812h-5.9062zm-52.53 5.032c-11.454 0.002-13.846 8.6116-14.531 10.5 5.1951 0.8111 1.1468 0.1597 5.8438 0.90625 7.7492-9.9816 16.562-1.875 16.562-1.875v3.5s-22.509-1.2119-22.406 11.375c2.4043 15 22.299 7.82 23.5 7.0938 2.2166 2.3843 5.9375 2.25 5.9375 2.25v-5.6562c-0.52641-0.10881-0.87935-0.0833-1.4375-0.90625v-19.906s-2.0147-7.283-13.469-7.2812zm198.22 0.1875c-9.4205 0.42073-15.919 8.7725-15.969 16.594-0.0494 7.8213 4.4946 15.206 14.219 16.875 12.013 2.2979 18.188-12.125 18.188-12.125h-5.6562s-3.7084 7.3138-11.781 6.2812c-8.0728-1.0326-8.5938-9.4062-8.5938-9.4062h26.031c0.0465-3.0912-2.0105-17.667-16.438-18.219zm-161.38 0.875c-1.1291 0.0224-2.2557 0.06802-3.25 0.1875-3.9771 0.47792-7.0938 3.4062-7.0938 3.4062v-3.5l-6.0312 0.09375v32.25h6.0312v-18.812c-0.0161-1.6616 1.5324-6.2329 8.1562-7.125 6.6239-0.89206 8.9688 0.875 8.9688 0.875v-7.1875s-3.394-0.25471-6.7812-0.1875zm136 0c-1.1291 0.0224-2.2557 0.06802-3.25 0.1875-3.9771 0.47792-7.0938 3.4062-7.0938 3.4062v-3.5l-6.0312 0.09375v32.25h6.0312v-18.812c-0.0161-1.6616 1.5324-6.2329 8.1562-7.125 6.6239-0.89206 8.9688 0.875 8.9688 0.875v-7.1875s-3.394-0.25471-6.7812-0.1875zm-68.781 0.1875v5.6562h3.9375v26.5h5.75v-32.062l-9.6875-0.09375zm94.438 4.9062c6.7026 0.04638 9.25 6.6875 9.25 6.6875h-18.312s2.3599-6.7339 9.0625-6.6875zm-63.562 0.125c5.5762-0.0319 10.752 4.9914 10.688 10.875-0.0644 5.8836-4.8675 11.175-10.594 11.312-5.7263 0.13721-10.614-4.7845-10.594-11.219 0.0201-6.4343 4.9238-10.937 10.5-10.969zm-129.75 12.469c1.607-0.03388 2.6875 0 2.6875 0v6.375s-13.972 7.5556-16.312-0.71875c-0.76249-4.765 8.8039-5.5546 13.625-5.6562z"
+       fill="#FFF"
+       id="path16" />
+  </g>
+  <g
+     transform="translate(.0032973 -.00070122)"
+     fill="#FFF"
+     id="g18">
+    <path
+       d="m130.04 18.393h4.3025v22.518h15.484v2.8935h-19.787v-25.412"
+       id="path20" />
+    <path
+       d="m173.78 18.719v2.97h-4.571v19.026h4.571v3.09h-13.221v-3.09h4.582l-0.021-19.026h-4.561v-2.97"
+       id="path22" />
+    <path
+       d="m184.7 25.266c2.1681-3.871 5.0128-7.2585 12.883-7.3167 7.8701-0.0582 11.236 4.6979 12.613 8.3936h-4.399c-1.9302-2.798-4.1746-5.1018-8.394-5.1168s-6.8628 2.1248-8.483 5.0274v9.8752c1.6684 2.8488 4.1439 4.9376 8.483 4.9376s6.5686-2.1546 8.394-5.1172h4.399c-2.9476 5.3117-5.6704 8.2892-12.613 8.3491-6.9426 0.0598-10.684-3.5197-12.883-7.3615z"
+       id="path24" />
+    <path
+       d="m221.82 18.393h20.107v2.8935h-15.804v7.5231h13.144v2.8935h-13.144v9.2084h16.188v2.8935h-20.49v-25.412"
+       id="path26" />
+    <path
+       d="m254.13 18.393h5.7934l14.101 21.258v-21.258h4.1747v25.412h-5.7934l-14.101-21.258v21.258h-4.1747v-25.412"
+       id="path28" />
+    <path
+       d="m291 25.266c2.1681-3.871 5.0128-7.2585 12.883-7.3167 7.8701-0.0582 11.236 4.6979 12.613 8.3936h-4.399c-1.9302-2.798-4.1746-5.1018-8.394-5.1168s-6.8628 2.1248-8.483 5.0274v9.8752c1.6684 2.8488 4.1439 4.9376 8.483 4.9376s6.5686-2.1546 8.394-5.1172h4.399c-2.9476 5.3117-5.6704 8.2892-12.613 8.3491-6.9426 0.0598-10.684-3.5197-12.883-7.3615z"
+       id="path30" />
+    <path
+       d="m328.69 18.393h20.107v2.8935h-15.804v7.5231h13.144v2.8935h-13.144v9.2084h16.188v2.8935h-20.49v-25.412"
+       id="path32" />
+  </g>
+</svg>