fixes

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo
index 6c1e2b6..440e48e 100644 (file)
Binary files a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo and b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.po b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
index 1ecf831..de29bb1 100644 (file)
--- 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-08-07 12:31+0200\n"
-"PO-Revision-Date: 2013-08-07 12:32+0100\n"
+"POT-Creation-Date: 2013-12-03 14:43+0100\n"
+"PO-Revision-Date: 2013-12-03 14:44+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -74,7 +74,7 @@ msgstr "Duży"
 msgid "Queue is full. Please try again later."
 msgstr "Kolejka jest pełna. Proszę spróbować ponownie później."
 
-#: views.py:521
+#: views.py:522
 #, python-format
 msgid ""
 "An error occurred: %(exception)s\n"
@@ -85,21 +85,21 @@ msgstr ""
 "\n"
 "%(tb)s"
 
-#: views.py:522
+#: views.py:523
 msgid "Book imported successfully"
 msgstr "Książka zaimportowana"
 
-#: views.py:524
+#: views.py:525
 #, python-format
 msgid "Error importing file: %r"
 msgstr "Błąd podczas importowania pliku: %r"
 
-#: views.py:556
+#: views.py:557
 msgid "Download custom PDF"
 msgstr "Stwórz własny PDF"
 
-#: views.py:557 templates/catalogue/book_short.html:96
-#: templates/catalogue/book_text.html:27 templates/catalogue/book_wide.html:63
+#: views.py:558 templates/catalogue/book_short.html:103
+#: templates/catalogue/book_wide.html:63
 msgid "Download"
 msgstr "Pobierz"
 
@@ -107,12 +107,12 @@ msgstr "Pobierz"
 msgid "title"
 msgstr "tytuł"
 
-#: models/book.py:29 models/tag.py:32
+#: models/book.py:29 models/tag.py:33
 msgid "sort key"
 msgstr "klucz sortowania"
 
 #: models/book.py:30 models/book.py:32 models/collection.py:12
-#: models/collection.py:15 models/tag.py:31
+#: models/collection.py:15 models/tag.py:32
 msgid "slug"
 msgstr "slug"
 
@@ -120,13 +120,13 @@ msgstr "slug"
 msgid "language code"
 msgstr "Kod języka"
 
-#: models/book.py:35 models/book.py:145 models/collection.py:13
-#: models/tag.py:35 models/tag.py:89
+#: models/book.py:35 models/book.py:151 models/collection.py:13
+#: models/tag.py:36 models/tag.py:90
 msgid "description"
 msgstr "opis"
 
-#: models/book.py:36 models/book.py:37 models/bookmedia.py:29 models/tag.py:42
-#: models/tag.py:43
+#: models/book.py:36 models/book.py:37 models/bookmedia.py:29 models/tag.py:43
+#: models/tag.py:44
 msgid "creation date"
 msgstr "data utworzenia"
 
@@ -142,7 +142,7 @@ msgstr "dodatkowe informacje"
 msgid "cover"
 msgstr "okładka"
 
-#: models/book.py:66 models/tag.py:21
+#: models/book.py:66 models/tag.py:22
 msgid "book"
 msgstr "książka"
 
@@ -150,17 +150,17 @@ msgstr "książka"
 msgid "books"
 msgstr "książki"
 
-#: models/book.py:243
+#: models/book.py:249
 #, python-format
 msgid "Book \"%s\" does not exist."
 msgstr "Utwór \"%s\" nie istnieje."
 
-#: models/book.py:257
+#: models/book.py:263
 #, python-format
 msgid "Book %s already exists"
 msgstr "Książka %s już istnieje"
 
-#: models/book.py:590 models/bookmedia.py:23
+#: models/book.py:608 models/bookmedia.py:23
 #, python-format
 msgid "%s file"
 msgstr "plik %s"
@@ -169,7 +169,7 @@ msgstr "plik %s"
 msgid "type"
 msgstr "typ"
 
-#: models/bookmedia.py:27 models/tag.py:30
+#: models/bookmedia.py:27 models/tag.py:31
 msgid "name"
 msgstr "nazwa"
 
@@ -201,47 +201,47 @@ msgstr "fragment"
 msgid "fragments"
 msgstr "fragmenty"
 
-#: models/tag.py:15
+#: models/tag.py:16
 msgid "author"
 msgstr "autor"
 
-#: models/tag.py:16
+#: models/tag.py:17
 msgid "epoch"
 msgstr "epoka"
 
-#: models/tag.py:17
+#: models/tag.py:18
 msgid "kind"
 msgstr "rodzaj"
 
-#: models/tag.py:18
+#: models/tag.py:19
 msgid "genre"
 msgstr "gatunek"
 
-#: models/tag.py:19
+#: models/tag.py:20
 msgid "theme"
 msgstr "motyw"
 
-#: models/tag.py:20
+#: models/tag.py:21
 msgid "set"
 msgstr "półka"
 
-#: models/tag.py:33
+#: models/tag.py:34
 msgid "category"
 msgstr "kategoria"
 
-#: models/tag.py:38
+#: models/tag.py:39
 msgid "book count"
 msgstr "liczba książek"
 
-#: models/tag.py:60
+#: models/tag.py:61
 msgid "tag"
 msgstr "tag"
 
-#: models/tag.py:61
+#: models/tag.py:62
 msgid "tags"
 msgstr "tagi"
 
-#: models/tag.py:78
+#: models/tag.py:79
 msgid ""
 "Book tags can't have attached links. Set them directly on the book instead "
 "of it's tag."
@@ -303,8 +303,8 @@ msgid ""
 "Commons Attribution-ShareAlike 3.0</a>\n"
 "        license."
 msgstr ""
-"Ten utwór nie jest objęty majątkowym prawem autorskim i&nbsp;znajduje się w&nbsp;"
-"domenie publicznej, co oznacza że możesz go swobodnie wykorzystywać, "
+"Ten utwór nie jest objęty majątkowym prawem autorskim i&nbsp;znajduje się "
+"w&nbsp;domenie publicznej, co oznacza że możesz go swobodnie wykorzystywać, "
 "publikować i&nbsp;rozpowszechniać. Jeśli utwór opatrzony jest dodatkowymi "
 "materiałami (przypisy, motywy literackie etc.), które podlegają prawu "
 "autorskiemu, to te dodatkowe materiały udostępnione są na licencji <a href="
@@ -323,7 +323,7 @@ msgstr "Opracowanie redakcyjne i przypisy:"
 msgid "Publication funded by:"
 msgstr "Publikację ufundowali i ufundowały:"
 
-#: templates/catalogue/book_info.html:41
+#: templates/catalogue/book_info.html:39
 msgid "Cover image by:"
 msgstr "Ilustracja na okładce:"
 
@@ -353,70 +353,99 @@ msgstr "Rodzaj"
 msgid "Genre"
 msgstr "Gatunek"
 
-#: templates/catalogue/book_short.html:92
+#: templates/catalogue/book_short.html:86
+msgid "Language"
+msgstr "Język"
+
+#: templates/catalogue/book_short.html:99
 msgid "Read online"
 msgstr "Czytaj online"
 
-#: templates/catalogue/book_short.html:99
-#: templates/catalogue/book_text.html:40
+#: templates/catalogue/book_short.html:106
 msgid "to print"
 msgstr "do druku"
 
-#: templates/catalogue/book_short.html:102
+#: templates/catalogue/book_short.html:109
 msgid "for an e-book reader"
 msgstr "na czytnik e-booków"
 
-#: templates/catalogue/book_short.html:105
-#: templates/catalogue/book_text.html:46
+#: templates/catalogue/book_short.html:112
 msgid "for Kindle"
 msgstr "na Kindle"
 
-#: templates/catalogue/book_short.html:108
-#: templates/catalogue/book_text.html:49
+#: templates/catalogue/book_short.html:115
 msgid "FictionBook"
 msgstr "FictionBook"
 
-#: templates/catalogue/book_short.html:111
-#: templates/catalogue/book_text.html:52
+#: templates/catalogue/book_short.html:118
 msgid "for advanced usage"
 msgstr "do zadań specjalnych"
 
-#: templates/catalogue/book_short.html:117
-#: templates/catalogue/book_text.html:30
+#: templates/catalogue/book_short.html:124
 msgid "Listen"
 msgstr "Słuchaj"
 
-#: templates/catalogue/book_text.html:9 templates/catalogue/player.html:11
+#: templates/catalogue/book_text.html:10 templates/catalogue/player.html:11
 msgid "Wolne Lektury"
 msgstr "Wolne Lektury"
 
-#: templates/catalogue/book_text.html:22
+#: templates/catalogue/book_text.html:34
+msgid "Other versions"
+msgstr "Inne wersje"
+
+#: templates/catalogue/book_text.html:40
 msgid "Table of contents"
 msgstr "Spis treści"
 
-#: templates/catalogue/book_text.html:23 templatetags/catalogue_tags.py:419
+#: templates/catalogue/book_text.html:44 templatetags/catalogue_tags.py:423
 msgid "Themes"
 msgstr "Motywy"
 
-#: templates/catalogue/book_text.html:24
+#: templates/catalogue/book_text.html:48
+#: templates/catalogue/book_text.html:100
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: templates/catalogue/book_text.html:52
 msgid "Edit. note"
 msgstr "Nota red."
 
-#: templates/catalogue/book_text.html:25
+#: templates/catalogue/book_text.html:56
 msgid "Infobox"
 msgstr "Informacje"
 
-#: templates/catalogue/book_text.html:26 templates/catalogue/player.html:34
-msgid "Book's page"
-msgstr "Strona utworu"
+#: templates/catalogue/book_text.html:68
+#: templates/catalogue/book_text.html:114
+msgid "Close"
+msgstr "Zamknij"
+
+#: templates/catalogue/book_text.html:69
+msgid "Please wait..."
+msgstr "Proszę czekać…"
 
-#: templates/catalogue/book_text.html:43
-msgid "for a reader"
-msgstr "na czytnik"
+#: templates/catalogue/book_text.html:82
+msgid "Other versions of the book"
+msgstr "Inne wersje utworu"
 
-#: templates/catalogue/book_text.html:56 templates/catalogue/book_wide.html:67
-msgid "Download all audiobooks for this book"
-msgstr "Pobierz wszystkie audiobooki tego utworu"
+#: templates/catalogue/book_text.html:83
+msgid "Close the other version"
+msgstr "Zamknij drugą wersję"
+
+#: templates/catalogue/book_text.html:101
+msgid "Display line numbers"
+msgstr "Wyświetlaj numerację"
+
+#: templates/catalogue/book_text.html:102
+msgid "Display themes"
+msgstr "Wyświetlaj motywy"
+
+#: templates/catalogue/book_text.html:103
+msgid "Display footnotes"
+msgstr "Wyświetlaj przypisy"
+
+#: templates/catalogue/book_text.html:116
+msgid "Loading"
+msgstr "Ładowanie"
 
 #: templates/catalogue/book_wide.html:22
 #: templates/catalogue/tagged_object_list.html:60
@@ -459,6 +488,10 @@ msgstr "Opis lektury w Wikipedii"
 msgid "Mix this book"
 msgstr "Miksuj treść utworu"
 
+#: templates/catalogue/book_wide.html:67
+msgid "Download all audiobooks for this book"
+msgstr "Pobierz wszystkie audiobooki tego utworu"
+
 #: templates/catalogue/catalogue.html:6 templates/catalogue/catalogue.html:11
 #: templates/catalogue/menu.html:5
 msgid "Catalogue"
@@ -471,28 +504,28 @@ msgstr "Pobierz katalog w formacie PDF."
 #: templates/catalogue/catalogue.html:19
 #: templates/catalogue/search_multiple_hits.html:17
 #: templates/catalogue/tagged_object_list.html:26
-#: templatetags/catalogue_tags.py:415
+#: templatetags/catalogue_tags.py:419
 msgid "Authors"
 msgstr "Autorzy"
 
 #: templates/catalogue/catalogue.html:22
 #: templates/catalogue/search_multiple_hits.html:25
 #: templates/catalogue/tagged_object_list.html:34
-#: templatetags/catalogue_tags.py:417
+#: templatetags/catalogue_tags.py:421
 msgid "Kinds"
 msgstr "Rodzaje"
 
 #: templates/catalogue/catalogue.html:25
 #: templates/catalogue/search_multiple_hits.html:33
 #: templates/catalogue/tagged_object_list.html:42
-#: templatetags/catalogue_tags.py:416
+#: templatetags/catalogue_tags.py:420
 msgid "Genres"
 msgstr "Gatunki"
 
 #: templates/catalogue/catalogue.html:28
 #: templates/catalogue/search_multiple_hits.html:41
 #: templates/catalogue/tagged_object_list.html:50
-#: templatetags/catalogue_tags.py:418
+#: templatetags/catalogue_tags.py:422
 msgid "Epochs"
 msgstr "Epoki"
 
@@ -546,7 +579,7 @@ msgstr "Zobacz całą kategorię"
 
 #: templates/catalogue/menu.html:4
 msgid "Catalogue of the library"
-msgstr ""
+msgstr "Katalog biblioteki"
 
 #: templates/catalogue/menu.html:13 templates/catalogue/menu.html.py:22
 msgid "Please wait…"
@@ -605,6 +638,10 @@ msgstr "Motywy w utworze"
 msgid "Listing of all pictures"
 msgstr "Spis wszystkich obrazów"
 
+#: templates/catalogue/player.html:34
+msgid "Book's page"
+msgstr "Strona utworu"
+
 #: templates/catalogue/player.html:35
 msgid "Download as"
 msgstr "Pobierz jako"
@@ -733,6 +770,9 @@ msgstr "Stwórz własny plik PDF"
 msgid "Free license"
 msgstr "Wolna licencja"
 
+#~ msgid "for a reader"
+#~ msgstr "na czytnik"
+
 #~ msgid "Put a book on the shelf!"
 #~ msgstr "Wrzuć lekturę na półkę!"
 

diff --git a/apps/wolnelektury_core/static/scss/book_text/const.scss b/apps/wolnelektury_core/static/scss/book_text/const.scss
index 3373fe8..4c8ab82 100644 (file)
--- a/apps/wolnelektury_core/static/scss/book_text/const.scss
+++ b/apps/wolnelektury_core/static/scss/book_text/const.scss
@@ -3,8 +3,8 @@ $S_MENU: 600px;
 
 $W_BOOK_TEXT_MIN: 160px;
 $W_BOOK_TEXT_MAX: 600px;
-$S_SMALL_TEXT_MAX: 600px;
-$S_SMALL_TEXT_MAX_WOTHER: 1200px;
+$S_SMALL_TEXT_MAX: 500px;
+$S_SMALL_TEXT_MAX_WOTHER: 1100px;
 
 $W_NONUMBERS_TINY: 20px;
 $S_NONUMBERS_TINY_MAX: 240px;

diff --git a/apps/wolnelektury_core/static/scss/book_text/menu.scss b/apps/wolnelektury_core/static/scss/book_text/menu.scss
index 380ba22..ec6cc1e 100644 (file)
--- a/apps/wolnelektury_core/static/scss/book_text/menu.scss
+++ b/apps/wolnelektury_core/static/scss/book_text/menu.scss
@@ -100,7 +100,7 @@
 }
 
 /* menu showing by default */
-@include min-screen(640px) {
+@include min-screen($S_MENU) {
     #menu {
         display: block;
     }