From 8851e7c8a2e324d6576656f45a08dc90d2c3dd98 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 27 Oct 2020 14:26:52 +0100 Subject: [PATCH] Add more properties in catalogue. --- src/catalogue/admin.py | 29 ++++- src/catalogue/constants.py | 1 + src/catalogue/locale/pl/LC_MESSAGES/django.mo | Bin 1066 -> 1619 bytes src/catalogue/locale/pl/LC_MESSAGES/django.po | 101 ++++++++++++++---- .../migrations/0019_auto_20201027_1331.py | 23 ++++ .../migrations/0020_auto_20201027_1416.py | 64 +++++++++++ .../migrations/0021_auto_20201027_1422.py | 37 +++++++ .../migrations/0022_auto_20201027_1424.py | 17 +++ src/catalogue/models.py | 43 ++++++++ 9 files changed, 293 insertions(+), 22 deletions(-) create mode 100644 src/catalogue/migrations/0019_auto_20201027_1331.py create mode 100644 src/catalogue/migrations/0020_auto_20201027_1416.py create mode 100644 src/catalogue/migrations/0021_auto_20201027_1422.py create mode 100644 src/catalogue/migrations/0022_auto_20201027_1424.py diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py index 00617cb6..608d625d 100644 --- a/src/catalogue/admin.py +++ b/src/catalogue/admin.py @@ -2,6 +2,7 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django.contrib import admin +from django.utils.translation import gettext_lazy as _ from . import models from .wikidata import WikidataAdminMixin @@ -12,11 +13,13 @@ class AuthorAdmin(WikidataAdminMixin, admin.ModelAdmin): "last_name", "status", "year_of_death", + "gender", + "nationality", "priority", "wikidata_link", "slug", ] - list_filter = ["year_of_death", "priority", "collections", "status"] + list_filter = ["year_of_death", "priority", "collections", "status", "gender", "nationality"] search_fields = ["first_name", "last_name", "wikidata"] prepopulated_fields = {"slug": ("first_name", "last_name")} autocomplete_fields = ["collections"] @@ -36,14 +39,14 @@ class BookAdmin(WikidataAdminMixin, admin.ModelAdmin): "wikidata_link", ] search_fields = ["title", "wikidata"] - autocomplete_fields = ["authors", "translators", "based_on", "collections"] + autocomplete_fields = ["authors", "translators", "based_on", "collections", "epochs", "genres", "kinds"] prepopulated_fields = {"slug": ("title",)} list_filter = ["language", "pd_year", "collections"] readonly_fields = ["wikidata_link"] fieldsets = [ (None, {"fields": [("wikidata", "wikidata_link")]}), ( - "Identification", + _("Identification"), { "fields": [ "title", @@ -57,7 +60,17 @@ class BookAdmin(WikidataAdminMixin, admin.ModelAdmin): }, ), ( - "Plan", + _("Features"), + { + "fields": [ + "epochs", + "genres", + "kinds", + ] + }, + ), + ( + _("Plan"), { "fields": [ "scans_source", @@ -99,3 +112,11 @@ class CollectionAdmin(admin.ModelAdmin): admin.site.register(models.Collection, CollectionAdmin) + + +class CategoryAdmin(admin.ModelAdmin): + search_fields = ["name"] + +admin.site.register(models.Epoch, CategoryAdmin) +admin.site.register(models.Genre, CategoryAdmin) +admin.site.register(models.Kind, CategoryAdmin) diff --git a/src/catalogue/constants.py b/src/catalogue/constants.py index 88d0e338..5bb775ac 100644 --- a/src/catalogue/constants.py +++ b/src/catalogue/constants.py @@ -2,6 +2,7 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # class WIKIDATA: + GENDER = "P21" AUTHOR = "P50" LANGUAGE = "P407" DATE_OF_DEATH = "P570" diff --git a/src/catalogue/locale/pl/LC_MESSAGES/django.mo b/src/catalogue/locale/pl/LC_MESSAGES/django.mo index eb7cf8594ea29e7f4edea762c8f12fecb203be27..da3bb2932f8f48077a71790affb0a4df7cf24a48 100644 GIT binary patch delta 938 zcmYk4J!lj`6vy9YFB;=%Vxlo7Cq(=L<>W3V2ui9GKjH^R;7Ft3+}`ANZq6Cm-9zsX z0s%W4S!`_VEmFkRPSe?lg`GB5f|V%*3;n;{QGCpMzj-tB=DmHhuSPx=*FR4bo)csi zT7vFCPeR{&FpzsgL^GfOhr!3-9&iIJfKR~@@R{>pfcxRU1TTS`AfNvR`rr<@3;YQp zew}_}vKtEp?D9qtWPcLm1hXI~o&!h0Q{Y~(>eiP)j;lF;+4*&l<5%7K9k<>DxA1Wa zJcImH!tI>kDhwyS<=AlRcR@}NfcwA>xC}mW{#y`(KEQDNCy*0=0l70@K@9p1!}~u# z?#M4D^3yPG=YwO8(;x>Nb36@lVA*jI#GobTUv~aY(7jsLp)s6c;bM+J`5C!`eD^eT z0xI~TB9y<3{{c=k1!cj@WQFnkAR8x#LH>eC=mEFJ;CE*^1RaN>!$j#(Z=rNWili6G zn69aINY`7^Bx+3sB2m_)4R57c?+QZ=qm6xNNc57>Mh-DGt<{-{DX`tH3^?k)X-x8g z4Z_^U)Rrcaxs6FH)5=VoZhAMytCjNng}Lg&#regvm1?Dumi^PKTNVpZ!0-4!t}Yuyiywt`lMs^?#cEWE&k0EY1@?= i!G9-`>%*$hHQe;~**7-ss&wM}Gix0+sLp delta 401 zcmXxfJxjw-6b9g%uYPER+RY#s6&I!9dWjvXlMafCsNl!q5HQ#fynz}il|sRv;6{es3}qveNEaDLz7Z-{W6Xim(1I(l z3|FBEw{!R4GWx^(`3*GC_hA9v!y*D^ESSM=Buy-9Z2)D5UaBvqdB@ag8UbqVQlKJ)dBWpg>%`WQCLiDj%(|o3|m2(v>NVi5}rn>D?H)( f%CXi8N1cl#j#S%fR(7KBN(QpS($DM5bC3N3?Xfhr diff --git a/src/catalogue/locale/pl/LC_MESSAGES/django.po b/src/catalogue/locale/pl/LC_MESSAGES/django.po index 3b3d06bb..2bf50562 100644 --- a/src/catalogue/locale/pl/LC_MESSAGES/django.po +++ b/src/catalogue/locale/pl/LC_MESSAGES/django.po @@ -7,8 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-20 16:44+0200\n" -"PO-Revision-Date: 2020-04-20 16:52+0200\n" +"POT-Creation-Date: 2020-10-27 14:25+0100\n" +"PO-Revision-Date: 2020-10-27 14:25+0100\n" +"Last-Translator: \n" +"Language-Team: \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -16,47 +18,111 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" "%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n" "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -"Last-Translator: \n" -"Language-Team: \n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.3\n" + +#: catalogue/admin.py:49 +msgid "Identification" +msgstr "Identyfikacja" -#: models.py:22 +#: catalogue/admin.py:63 +msgid "Features" +msgstr "Cechy" + +#: catalogue/admin.py:73 +msgid "Plan" +msgstr "Plan" + +#: catalogue/models.py:26 msgid "Alive" msgstr "Żyje" -#: models.py:23 +#: catalogue/models.py:27 msgid "Dead" msgstr "Zmarły" -#: models.py:24 +#: catalogue/models.py:28 msgid "Long dead" msgstr "Dawno zmarły" -#: models.py:25 +#: catalogue/models.py:29 msgid "Unknown" msgstr "Nieznany" -#: models.py:37 models.py:83 +#: catalogue/models.py:41 catalogue/models.py:120 msgid "Low" msgstr "Niski" -#: models.py:37 models.py:83 +#: catalogue/models.py:41 catalogue/models.py:120 msgid "Medium" msgstr "Średni" -#: models.py:37 models.py:83 +#: catalogue/models.py:41 catalogue/models.py:120 msgid "High" msgstr "Wysoki" -#: templates/catalogue/catalogue.html:7 templates/catalogue/catalogue.html:13 +#: catalogue/models.py:46 +msgid "author" +msgstr "autor" + +#: catalogue/models.py:47 +msgid "authors" +msgstr "autorzy" + +#: catalogue/models.py:83 +msgid "epoch" +msgstr "epoka" + +#: catalogue/models.py:84 +msgid "epochs" +msgstr "epoki" + +#: catalogue/models.py:89 +msgid "genre" +msgstr "gatunek" + +#: catalogue/models.py:90 +msgid "genres" +msgstr "gatunki" + +#: catalogue/models.py:95 +msgid "kind" +msgstr "rodzaj" + +#: catalogue/models.py:96 +msgid "kinds" +msgstr "rodzaje" + +#: catalogue/models.py:130 +msgid "book" +msgstr "książka" + +#: catalogue/models.py:131 +msgid "books" +msgstr "książki" + +#: catalogue/models.py:170 +msgid "collection" +msgstr "kolekcja" + +#: catalogue/models.py:171 +msgid "collections" +msgstr "kolekcje" + +#: catalogue/templates/catalogue/author_detail.html:7 +#: catalogue/templates/catalogue/author_detail.html:13 +#: catalogue/templates/catalogue/book_detail.html:7 +#: catalogue/templates/catalogue/book_detail.html:13 +#: catalogue/templates/catalogue/catalogue.html:7 +#: catalogue/templates/catalogue/catalogue.html:13 msgid "Catalogue" msgstr "Katalog" -#: templates/catalogue/catalogue.html:67 +#: catalogue/templates/catalogue/author_detail.html:66 +#: catalogue/templates/catalogue/catalogue.html:67 msgid "trans." msgstr "tłum." -#: templates/catalogue/catalogue.html:90 +#: catalogue/templates/catalogue/catalogue.html:90 #, python-format msgid "%(c)s author" msgid_plural "%(c)s authors" @@ -65,7 +131,6 @@ msgstr[1] "%(c)s autorów" msgstr[2] "%(c)s autorów" msgstr[3] "" -#: wikidata.py:18 +#: catalogue/wikidata.py:18 msgid "If you have a Wikidata ID, like \"Q1337\", enter it and save." -msgstr "" -"Jeśli masz identyfikator Wikidanych , jak „Q1337”, wklej go i zapisz." +msgstr "Jeśli masz identyfikator Wikidanych , jak „Q1337”, wklej go i zapisz." diff --git a/src/catalogue/migrations/0019_auto_20201027_1331.py b/src/catalogue/migrations/0019_auto_20201027_1331.py new file mode 100644 index 00000000..bda87224 --- /dev/null +++ b/src/catalogue/migrations/0019_auto_20201027_1331.py @@ -0,0 +1,23 @@ +# Generated by Django 3.0.4 on 2020-10-27 13:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('catalogue', '0018_auto_20200417_1859'), + ] + + operations = [ + migrations.AddField( + model_name='author', + name='gender', + field=models.CharField(blank=True, max_length=255), + ), + migrations.AddField( + model_name='author', + name='nationality', + field=models.CharField(blank=True, max_length=255), + ), + ] diff --git a/src/catalogue/migrations/0020_auto_20201027_1416.py b/src/catalogue/migrations/0020_auto_20201027_1416.py new file mode 100644 index 00000000..274c4797 --- /dev/null +++ b/src/catalogue/migrations/0020_auto_20201027_1416.py @@ -0,0 +1,64 @@ +# Generated by Django 3.0.4 on 2020-10-27 14:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('catalogue', '0019_auto_20201027_1331'), + ] + + operations = [ + migrations.CreateModel( + name='Epoch', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('wikidata', models.CharField(blank=True, help_text='If you have a Wikidata ID, like "Q1337", enter it and save.', max_length=255)), + ('name', models.CharField(max_length=255)), + ('slug', models.SlugField(max_length=255, unique=True)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Genre', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('wikidata', models.CharField(blank=True, help_text='If you have a Wikidata ID, like "Q1337", enter it and save.', max_length=255)), + ('name', models.CharField(max_length=255)), + ('slug', models.SlugField(max_length=255, unique=True)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Kind', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('wikidata', models.CharField(blank=True, help_text='If you have a Wikidata ID, like "Q1337", enter it and save.', max_length=255)), + ('name', models.CharField(max_length=255)), + ('slug', models.SlugField(max_length=255, unique=True)), + ], + options={ + 'abstract': False, + }, + ), + migrations.AddField( + model_name='book', + name='epochs', + field=models.ManyToManyField(blank=True, to='catalogue.Epoch'), + ), + migrations.AddField( + model_name='book', + name='genres', + field=models.ManyToManyField(blank=True, to='catalogue.Genre'), + ), + migrations.AddField( + model_name='book', + name='kinds', + field=models.ManyToManyField(blank=True, to='catalogue.Kind'), + ), + ] diff --git a/src/catalogue/migrations/0021_auto_20201027_1422.py b/src/catalogue/migrations/0021_auto_20201027_1422.py new file mode 100644 index 00000000..0f77d780 --- /dev/null +++ b/src/catalogue/migrations/0021_auto_20201027_1422.py @@ -0,0 +1,37 @@ +# Generated by Django 3.0.4 on 2020-10-27 14:22 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('catalogue', '0020_auto_20201027_1416'), + ] + + operations = [ + migrations.AlterModelOptions( + name='author', + options={'ordering': ('last_name', 'first_name', 'year_of_death'), 'verbose_name': 'author', 'verbose_name_plural': 'authors'}, + ), + migrations.AlterModelOptions( + name='book', + options={'ordering': ('title',), 'verbose_name': 'book', 'verbose_name_plural': 'books'}, + ), + migrations.AlterModelOptions( + name='collection', + options={'verbose_name': 'collection', 'verbose_name_plural': 'collections'}, + ), + migrations.AlterModelOptions( + name='epoch', + options={'verbose_name': 'author', 'verbose_name_plural': 'authors'}, + ), + migrations.AlterModelOptions( + name='genre', + options={'verbose_name': 'genre', 'verbose_name_plural': 'genres'}, + ), + migrations.AlterModelOptions( + name='kind', + options={'verbose_name': 'kind', 'verbose_name_plural': 'kinds'}, + ), + ] diff --git a/src/catalogue/migrations/0022_auto_20201027_1424.py b/src/catalogue/migrations/0022_auto_20201027_1424.py new file mode 100644 index 00000000..434e7451 --- /dev/null +++ b/src/catalogue/migrations/0022_auto_20201027_1424.py @@ -0,0 +1,17 @@ +# Generated by Django 3.0.4 on 2020-10-27 14:24 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('catalogue', '0021_auto_20201027_1422'), + ] + + operations = [ + migrations.AlterModelOptions( + name='epoch', + options={'verbose_name': 'epoch', 'verbose_name_plural': 'epochs'}, + ), + ] diff --git a/src/catalogue/models.py b/src/catalogue/models.py index 0863c1e3..682e97bc 100644 --- a/src/catalogue/models.py +++ b/src/catalogue/models.py @@ -2,6 +2,7 @@ from django.apps import apps from django.db import models from django.urls import reverse from django.utils.translation import gettext_lazy as _ +from wikidata.client import Client from .constants import WIKIDATA from .utils import UnrelatedManager from .wikidata import WikidataMixin @@ -15,6 +16,8 @@ class Author(WikidataMixin, models.Model): name_de = models.CharField(max_length=255, blank=True) name_lt = models.CharField(max_length=255, blank=True) + gender = models.CharField(max_length=255, blank=True) + nationality = models.CharField(max_length=255, blank=True) year_of_death = models.SmallIntegerField(null=True, blank=True) status = models.PositiveSmallIntegerField( null=True, @@ -40,12 +43,15 @@ class Author(WikidataMixin, models.Model): collections = models.ManyToManyField("Collection", blank=True) class Meta: + verbose_name = _('author') + verbose_name_plural = _('authors') ordering = ("last_name", "first_name", "year_of_death") class Wikidata: first_name = WIKIDATA.GIVEN_NAME last_name = WIKIDATA.LAST_NAME year_of_death = WIKIDATA.DATE_OF_DEATH + gender = WIKIDATA.GENDER notes = "description" def __str__(self): @@ -63,6 +69,33 @@ class Author(WikidataMixin, models.Model): else: return None + +class Category(WikidataMixin, models.Model): + name = models.CharField(max_length=255) + slug = models.SlugField(max_length=255, unique=True) + + class Meta: + abstract = True + + +class Epoch(Category): + class Meta: + verbose_name = _('epoch') + verbose_name_plural = _('epochs') + + +class Genre(Category): + class Meta: + verbose_name = _('genre') + verbose_name_plural = _('genres') + + +class Kind(Category): + class Meta: + verbose_name = _('kind') + verbose_name_plural = _('kinds') + + class Book(WikidataMixin, models.Model): slug = models.SlugField(max_length=255, blank=True, null=True, unique=True) authors = models.ManyToManyField(Author, blank=True) @@ -72,6 +105,9 @@ class Book(WikidataMixin, models.Model): related_query_name="translated_book", blank=True, ) + epochs = models.ManyToManyField(Epoch, blank=True) + kinds = models.ManyToManyField(Kind, blank=True) + genres = models.ManyToManyField(Genre, blank=True) title = models.CharField(max_length=255, blank=True) language = models.CharField(max_length=255, blank=True) based_on = models.ForeignKey( @@ -91,6 +127,8 @@ class Book(WikidataMixin, models.Model): class Meta: ordering = ("title",) + verbose_name = _('book') + verbose_name_plural = _('books') class Wikidata: authors = WIKIDATA.AUTHOR @@ -128,5 +166,10 @@ class Collection(models.Model): name = models.CharField(max_length=255) slug = models.SlugField(max_length=255, unique=True) + class Meta: + verbose_name = _('collection') + verbose_name_plural = _('collections') + def __str__(self): return self.name + -- 2.20.1