From 2d755ff729a4752c26b8dc3526f7ef0dc2c39fc0 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 24 Oct 2014 12:00:32 +0200 Subject: [PATCH] Minor presentation fixes. --- apps/dictionary/constants.py | 15 +++ .../locale/pl/LC_MESSAGES/django.mo | Bin 962 -> 1255 bytes .../locale/pl/LC_MESSAGES/django.po | 20 ++- .../templates/dictionary/note_list.html | 6 +- apps/dictionary/views.py | 4 +- apps/picture/locale/pl/LC_MESSAGES/django.mo | Bin 2082 -> 2279 bytes apps/picture/locale/pl/LC_MESSAGES/django.po | 119 ++++++++++-------- .../static/scss/main/book_box.scss | 3 +- 8 files changed, 110 insertions(+), 57 deletions(-) create mode 100644 apps/dictionary/constants.py diff --git a/apps/dictionary/constants.py b/apps/dictionary/constants.py new file mode 100644 index 000000000..e99dc3ff0 --- /dev/null +++ b/apps/dictionary/constants.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +from __future__ import unicode_literals + +from django.utils.translation import ugettext_lazy as _ + + +FN_TYPES = { + 'pa': _("author's footnotes"), + 'pe': _("Wolne Lektury editorial footnotes"), + 'pr': _("source editorial footnotes"), + 'pt': _("translator's footnotes"), +} diff --git a/apps/dictionary/locale/pl/LC_MESSAGES/django.mo b/apps/dictionary/locale/pl/LC_MESSAGES/django.mo index 2dbef9a045833f100998fd2d17891054e24c1492..c95d7b4e57074096fc159d4de98421d26e9a34e8 100644 GIT binary patch delta 565 zcmZwCze~eF6bJB&R%@*w7IaX-D-MFvp8z+xL4PdIHFtR#A_ z!)d&iplQV581&&HY(UfS9GV6fa1LJg-yb1L$6*FBF@(f+93$~_p;yE-7)P20qw$B{ zU!_l?YHL?`KBr|~(}4^rcU&!`%RIU-g!YBziZIV3EYKApm(-taB?4*le{X2XeC07z z8o03~MU~q+x9Q||xKyt2i?p+0m6EG8pDz~HI%ih)d)>XWKCOCPHp9BBLMpk#YN+?n xZBR3DXjl3(lZI-BO4nRYeokXrA=SWET)?inG`c|%Cu+0b<2q^w2h46V@&#Slen0>K delta 251 zcmaFPd5FFKo)F7a1|Z-7Vi_Qg0b*_-o&&@nZ~}<6fcPX3^8@i0AO^{^FfuUk0BHdr z%?_kxfix$ORt3_`Kw2M2KLcW8APxlbrGSDU{W(y&21tuCFt{=F02v^I76ECHBh~|H zkU=|uG*B\n" "Language-Team: LANGUAGE \n" "Language: pl\n" @@ -19,6 +19,22 @@ msgstr "" "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.5.4\n" +#: constants.py:11 +msgid "author's footnotes" +msgstr "przypisy autorskie" + +#: constants.py:12 +msgid "Wolne Lektury editorial footnotes" +msgstr "przypisy redaktorów Wolnych Lektur" + +#: constants.py:13 +msgid "source editorial footnotes" +msgstr "przypisy redakcji źródła" + +#: constants.py:14 +msgid "translator's footnotes" +msgstr "przypisy tłumacza" + #: templates/dictionary/note_list.html:8 #: templates/dictionary/note_list.html:12 msgid "Footnotes" diff --git a/apps/dictionary/templates/dictionary/note_list.html b/apps/dictionary/templates/dictionary/note_list.html index 330b2a7f8..3d4916c7d 100755 --- a/apps/dictionary/templates/dictionary/note_list.html +++ b/apps/dictionary/templates/dictionary/note_list.html @@ -39,12 +39,12 @@ {% trans "all" %} {% endif %} -{% for fnt in fn_types %} +{% for fnt, fnt_name in fn_types %} | {% if fnt == fn_type %} - {{ fnt }} + {{ fnt_name }} {% else %} - {{ fnt }} + {{ fnt_name }} {% endif %} {% endfor %}

diff --git a/apps/dictionary/views.py b/apps/dictionary/views.py index 42aab6c36..76530bc42 100755 --- a/apps/dictionary/views.py +++ b/apps/dictionary/views.py @@ -2,9 +2,10 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from dictionary.models import Note, Qualifier from django.views.generic.list import ListView from django.db.models import Count, Q +from .constants import FN_TYPES +from .models import Note, Qualifier class NotesView(ListView): @@ -56,6 +57,7 @@ class NotesView(ListView): nobj = nobj.filter(fltr) self.fn_types = nobj.order_by('fn_type').values_list( 'fn_type', flat=True).distinct() + self.fn_types = [(fnt, FN_TYPES[fnt]) for fnt in self.fn_types] for f in filters.values(): objects = objects.filter(f) diff --git a/apps/picture/locale/pl/LC_MESSAGES/django.mo b/apps/picture/locale/pl/LC_MESSAGES/django.mo index 627bedaa34635a3d7721323a5b122cbb5441ab45..f3bc162caea50bf3e76028f1e82595c950d75141 100644 GIT binary patch delta 1069 zcmYMzPe_zO7{~G1_HU`1T3YH>Z)T-Mv5KJt1)&`xqeEHIALwm;tC!qebJt|0Sc1BQ zmv{+@{v5eR6!2)yJM&-I(HWoG}g4b~k-oOUDjZqA6BR;g_7uJ`UWd1eA@jYsvC5+)0WS_G6 zPN$WLKd6OCRyo*=o3Iac@G!E(T*L&9pf<|lS}dXxx?|_>VGZN^$YY-Hs>4~-1)f(d z8}o*aZvF{*%x_-G{4Xk@D7!Xd9qM2QwXVyK_acw!vmUSx;76)?1hroqn<;@^*o^%c z<9u_Rj!Jk6c}$)czcG`jAKpS$U>a3{8B`*VP!*WNdVGdFX2Fi%qAI(DTK@~Rei>C6 zO_o<d7 zg72@)7wy6isDwV-h2M}0nw^9W)~2Qv%htwc5dTwy(q-LZ4Dim8s`^ zvx80tp^~Ty%5)2%n^l|2zk%3pC-l#uPevsxf22*gndl_85vq<_%YQ1jJ)v7cEIvwy zE+x3M9UP>zP;hcA6*CAfmJ~`C5f>4PgWq4g(507m@8{n8^4>k?^G~sW&)oeDESUxNmdR~y ze8n4hh+NiTNZ@ZwI1_t%M1fo?IVGM`Wf?4h3jjykxFO0a|EU?-U1d^=;3 z!3)%bK7-a7RLRPy0B4b(*kkO)1}gI>Zhy(GSKRsqs&Z?n%Dlz_Y@q`Gf`KCW!9*`^ zqar>+Mf}t4pCZZHIV!NfsNW@tN`Yii&li!xbesEpY?PJWb@O`LhH;3lzow}FUnNuP zqbo|iSY=YXLstcq{TTg!t<0v9P$d+MGS>H`3>8$4u2!Mn>dv|!UN<36p{XSLpp;p- z7M%}&MPG)ivB8~Jv0NlooxE3lSelrcc~Bd#PJ|!hh2+1jsh$0JBN9$~&2Ybke Ic-P;(0;K>&Q~&?~ diff --git a/apps/picture/locale/pl/LC_MESSAGES/django.po b/apps/picture/locale/pl/LC_MESSAGES/django.po index df055fa01..63546c20d 100644 --- a/apps/picture/locale/pl/LC_MESSAGES/django.po +++ b/apps/picture/locale/pl/LC_MESSAGES/django.po @@ -7,11 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-07 16:36+0100\n" -"PO-Revision-Date: 2014-02-07 16:36+0100\n" +"POT-Creation-Date: 2014-10-24 11:44+0200\n" +"PO-Revision-Date: 2014-10-24 11:48+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,88 +18,71 @@ msgstr "" "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.5.4\n" -#: forms.py:21 +#: forms.py:25 msgid "Please supply an XML." msgstr "" -#: forms.py:29 +#: forms.py:33 msgid "Please supply an image." msgstr "" -#: models.py:38 +#: models.py:35 msgid "area" msgstr "obszar" -#: models.py:39 +#: models.py:36 msgid "kind" msgstr "typ" -#: models.py:41 +#: models.py:38 msgid "thing" msgstr "przedmiot" -#: models.py:42 +#: models.py:39 msgid "theme" msgstr "motyw" -#: models.py:92 +#: models.py:75 msgid "title" msgstr "tytuł" -#: models.py:93 +#: models.py:76 msgid "slug" msgstr "slug" -#: models.py:94 +#: models.py:77 msgid "sort key" msgstr "klucz sortowania" -#: models.py:95 +#: models.py:78 #, fuzzy msgid "sort key by author" msgstr "klucz sortowania" -#: models.py:96 models.py:97 +#: models.py:79 models.py:80 msgid "creation date" msgstr "data stworzenia" -#: models.py:99 +#: models.py:82 msgid "image_file" msgstr "" -#: models.py:101 +#: models.py:84 msgid "picture areas JSON" msgstr "obszary w JSON" -#: models.py:102 +#: models.py:85 msgid "extra information" msgstr "dodatkowa informacja" -#: models.py:121 +#: models.py:105 msgid "picture" msgstr "obraz" -#: models.py:122 +#: models.py:106 msgid "pictures" msgstr "obrazy" -#: views.py:82 -#, python-format -msgid "" -"An error occurred: %(exception)s\n" -"\n" -"%(tb)s" -msgstr "" - -#: views.py:83 -msgid "Picture imported successfully" -msgstr "Obraz został zimportowany" - -#: views.py:85 -#, python-format -msgid "Error importing file: %r" -msgstr "Błąd importu pliku: %r" - #: templates/admin/picture/picture/change_list.html:8 msgid "Image" msgstr "Obraz" @@ -109,8 +91,12 @@ msgstr "Obraz" msgid "Import picture" msgstr "Importuj obraz" -#: templates/picture/picture_list_thumb.html:10 -#: templates/picture/picture_list_thumb.html:14 +#: templates/picture/picture_detail.html:21 +msgid "See also" +msgstr "Zobacz też" + +#: templates/picture/picture_list_thumb.html:9 +#: templates/picture/picture_list_thumb.html:13 msgctxt "gallery" msgid "Listing of all works" msgstr "Spis wszystkich dzieł" @@ -127,16 +113,16 @@ msgstr "Typ" msgid "Genre" msgstr "Gatunek" -#: templates/picture/picture_short.html:68 +#: templates/picture/picture_short.html:71 msgid "View online" msgstr "Zobacz online" -#: templates/picture/picture_short.html:71 +#: templates/picture/picture_short.html:74 msgid "download original" msgstr "pobierz oryginał" #: templates/picture/picture_viewer.html:36 -#: templates/picture/picture_wide.html:31 +#: templates/picture/picture_wide.html:64 msgid "Objects" msgstr "Obiekty" @@ -148,42 +134,75 @@ msgstr "Motywy" msgid "Infobox" msgstr "Informacja" -#: templates/picture/picture_wide.html:20 +#: templates/picture/picture_wide.html:19 +msgid "Style" +msgstr "Styl" + +#: templates/picture/picture_wide.html:29 +msgid "Medium" +msgstr "Technika" + +#: templates/picture/picture_wide.html:36 +msgid "Dimensions" +msgstr "Wymiary pracy" + +#: templates/picture/picture_wide.html:42 +msgid "Date" +msgstr "Czas powstania" + +#: templates/picture/picture_wide.html:53 msgid "Motifs, themes and objects" msgstr "Motywy i obiekty" -#: templates/picture/picture_wide.html:23 +#: templates/picture/picture_wide.html:56 msgid "Motifs and themes" msgstr "Motywy" -#: templates/picture/picture_wide.html:49 +#: templates/picture/picture_wide.html:82 msgid "See" msgstr "Zobacz" -#: templates/picture/picture_wide.html:52 +#: templates/picture/picture_wide.html:85 msgid "Source" msgstr "Źródło" -#: templates/picture/picture_wide.html:52 +#: templates/picture/picture_wide.html:85 msgid "of the picture" msgstr "obrazu" -#: templates/picture/picture_wide.html:54 +#: templates/picture/picture_wide.html:87 msgid "Source XML file" msgstr "Źródło XML" -#: templates/picture/picture_wide.html:56 +#: templates/picture/picture_wide.html:89 msgid "Picture on" msgstr "Obraz na" -#: templates/picture/picture_wide.html:56 +#: templates/picture/picture_wide.html:89 msgid "Editor's Platform" msgstr "platformie edytorskiej" -#: templates/picture/picture_wide.html:59 +#: templates/picture/picture_wide.html:92 msgid "Picture description on Wikipedia" msgstr "Opis w Wikipedii" +#: views.py:91 +#, python-format +msgid "" +"An error occurred: %(exception)s\n" +"\n" +"%(tb)s" +msgstr "" + +#: views.py:92 +msgid "Picture imported successfully" +msgstr "Obraz został zimportowany" + +#: views.py:94 +#, python-format +msgid "Error importing file: %r" +msgstr "Błąd importu pliku: %r" + #~ msgid "Download" #~ msgstr "Pobierz" diff --git a/apps/wolnelektury_core/static/scss/main/book_box.scss b/apps/wolnelektury_core/static/scss/main/book_box.scss index 4640b30ac..d318fda34 100755 --- a/apps/wolnelektury_core/static/scss/main/book_box.scss +++ b/apps/wolnelektury_core/static/scss/main/book_box.scss @@ -524,7 +524,8 @@ } -#book-detail .see-also { +#book-detail .see-also, +#picture-detail .see-also { h1 { @include size(height, 32px); margin: 0; -- 2.20.1