From a409c6cc6901eea44c2cbe3a49038eb21f2db18d Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Thu, 26 Nov 2020 13:10:44 +0100 Subject: [PATCH] Better management of manually-set members. --- src/catalogue/locale/de/LC_MESSAGES/django.po | 32 ++++++----- src/catalogue/locale/en/LC_MESSAGES/django.po | 32 ++++++----- src/catalogue/locale/es/LC_MESSAGES/django.po | 32 ++++++----- src/catalogue/locale/fr/LC_MESSAGES/django.po | 32 ++++++----- src/catalogue/locale/it/LC_MESSAGES/django.po | 32 ++++++----- src/catalogue/locale/lt/LC_MESSAGES/django.po | 32 ++++++----- src/catalogue/locale/ru/LC_MESSAGES/django.po | 32 ++++++----- src/catalogue/locale/uk/LC_MESSAGES/django.po | 32 ++++++----- src/club/admin.py | 6 ++- src/club/locale/de/LC_MESSAGES/django.po | 48 ++++++++++------- src/club/locale/en/LC_MESSAGES/django.po | 48 ++++++++++------- src/club/locale/es/LC_MESSAGES/django.po | 48 ++++++++++------- src/club/locale/fr/LC_MESSAGES/django.po | 48 ++++++++++------- src/club/locale/it/LC_MESSAGES/django.po | 48 ++++++++++------- src/club/locale/lt/LC_MESSAGES/django.po | 48 ++++++++++------- src/club/locale/pl/LC_MESSAGES/django.mo | Bin 6047 -> 6215 bytes src/club/locale/pl/LC_MESSAGES/django.po | 50 +++++++++++------- src/club/locale/ru/LC_MESSAGES/django.po | 48 ++++++++++------- src/club/locale/uk/LC_MESSAGES/django.po | 48 ++++++++++------- src/club/models.py | 21 +++++++- src/messaging/locale/de/LC_MESSAGES/django.po | 28 +++++----- src/messaging/locale/en/LC_MESSAGES/django.po | 28 +++++----- src/messaging/locale/es/LC_MESSAGES/django.po | 28 +++++----- src/messaging/locale/fr/LC_MESSAGES/django.po | 28 +++++----- src/messaging/locale/it/LC_MESSAGES/django.po | 28 +++++----- src/messaging/locale/lt/LC_MESSAGES/django.po | 28 +++++----- src/messaging/locale/pl/LC_MESSAGES/django.mo | Bin 2967 -> 3036 bytes src/messaging/locale/pl/LC_MESSAGES/django.po | 32 ++++++----- src/messaging/locale/ru/LC_MESSAGES/django.po | 28 +++++----- src/messaging/locale/uk/LC_MESSAGES/django.po | 28 +++++----- src/messaging/models.py | 11 ++++ src/messaging/states.py | 1 + .../locale/de/LC_MESSAGES/django.po | 15 +++--- .../locale/en/LC_MESSAGES/django.po | 15 +++--- .../locale/es/LC_MESSAGES/django.po | 15 +++--- .../locale/fr/LC_MESSAGES/django.po | 15 +++--- .../locale/it/LC_MESSAGES/django.po | 15 +++--- .../locale/lt/LC_MESSAGES/django.po | 15 +++--- .../locale/pl/LC_MESSAGES/django.po | 15 +++--- .../locale/ru/LC_MESSAGES/django.po | 15 +++--- .../locale/uk/LC_MESSAGES/django.po | 15 +++--- 41 files changed, 668 insertions(+), 452 deletions(-) diff --git a/src/catalogue/locale/de/LC_MESSAGES/django.po b/src/catalogue/locale/de/LC_MESSAGES/django.po index 327c386d7..f4a7ec6e5 100644 --- a/src/catalogue/locale/de/LC_MESSAGES/django.po +++ b/src/catalogue/locale/de/LC_MESSAGES/django.po @@ -280,11 +280,11 @@ msgstr "Buch mit dem Slug = \"%s\" ist nicht vorhanden." msgid "Book %s already exists" msgstr "Buch %s ist bereits vorhanden" -#: catalogue/models/book.py:813 +#: catalogue/models/book.py:853 msgid "This work needs modernisation" msgstr "" -#: catalogue/models/book.py:892 catalogue/models/bookmedia.py:27 +#: catalogue/models/book.py:932 catalogue/models/bookmedia.py:27 #, python-format msgid "%s file" msgstr "%s XML-Datei" @@ -408,7 +408,7 @@ msgid "tags" msgstr "Tags" #: catalogue/templates/catalogue/book_detail.html:24 -#: catalogue/templates/catalogue/book_text.html:25 +#: catalogue/templates/catalogue/book_text.html:34 #, fuzzy #| msgid "Other resources" msgid "Other versions" @@ -419,8 +419,8 @@ msgid "See also" msgstr "Siehe auch" #: catalogue/templates/catalogue/book_detail.html:41 -#: catalogue/templates/catalogue/book_text.html:38 -#: catalogue/templates/catalogue/book_text.html:57 +#: catalogue/templates/catalogue/book_text.html:47 +#: catalogue/templates/catalogue/book_text.html:66 #: catalogue/templates/catalogue/tagged_object_list.html:20 msgid "Themes" msgstr "Motive" @@ -605,42 +605,46 @@ msgstr "" msgid "For now this work is only available for our subscribers." msgstr "" -#: catalogue/templates/catalogue/book_text.html:32 +#: catalogue/templates/catalogue/book_text.html:41 msgid "Table of contents" msgstr "Inhaltsverzeichnis" -#: catalogue/templates/catalogue/book_text.html:44 +#: catalogue/templates/catalogue/book_text.html:53 msgid "Edit. note" msgstr "Editieren. Notiz" -#: catalogue/templates/catalogue/book_text.html:50 +#: catalogue/templates/catalogue/book_text.html:59 msgid "Infobox" msgstr "Infobox" -#: catalogue/templates/catalogue/book_text.html:55 +#: catalogue/templates/catalogue/book_text.html:64 msgid "Numbering" msgstr "" -#: catalogue/templates/catalogue/book_text.html:59 +#: catalogue/templates/catalogue/book_text.html:68 #, fuzzy #| msgid "Don't show footnotes" msgid "Footnotes" msgstr "Zeige die Fußnoten nicht" -#: catalogue/templates/catalogue/book_text.html:82 +#: catalogue/templates/catalogue/book_text.html:70 +msgid "References" +msgstr "" + +#: catalogue/templates/catalogue/book_text.html:93 #: catalogue/templates/catalogue/viewer_base.html:54 msgid "Close" msgstr "" -#: catalogue/templates/catalogue/book_text.html:83 +#: catalogue/templates/catalogue/book_text.html:94 msgid "Please wait..." msgstr "" -#: catalogue/templates/catalogue/book_text.html:127 +#: catalogue/templates/catalogue/book_text.html:149 msgid "Other versions of the book" msgstr "" -#: catalogue/templates/catalogue/book_text.html:128 +#: catalogue/templates/catalogue/book_text.html:150 msgid "Close the other version" msgstr "" diff --git a/src/catalogue/locale/en/LC_MESSAGES/django.po b/src/catalogue/locale/en/LC_MESSAGES/django.po index aaf1387fa..932a6dffd 100644 --- a/src/catalogue/locale/en/LC_MESSAGES/django.po +++ b/src/catalogue/locale/en/LC_MESSAGES/django.po @@ -280,11 +280,11 @@ msgstr "Book with stub = \"%s\" does not exist." msgid "Book %s already exists" msgstr "Book %s already exists" -#: catalogue/models/book.py:813 +#: catalogue/models/book.py:853 msgid "This work needs modernisation" msgstr "" -#: catalogue/models/book.py:892 catalogue/models/bookmedia.py:27 +#: catalogue/models/book.py:932 catalogue/models/bookmedia.py:27 #, python-format msgid "%s file" msgstr "%s file" @@ -407,7 +407,7 @@ msgid "tags" msgstr "tags" #: catalogue/templates/catalogue/book_detail.html:24 -#: catalogue/templates/catalogue/book_text.html:25 +#: catalogue/templates/catalogue/book_text.html:34 #, fuzzy #| msgid "Other resources" msgid "Other versions" @@ -418,8 +418,8 @@ msgid "See also" msgstr "See also" #: catalogue/templates/catalogue/book_detail.html:41 -#: catalogue/templates/catalogue/book_text.html:38 -#: catalogue/templates/catalogue/book_text.html:57 +#: catalogue/templates/catalogue/book_text.html:47 +#: catalogue/templates/catalogue/book_text.html:66 #: catalogue/templates/catalogue/tagged_object_list.html:20 msgid "Themes" msgstr "Themes" @@ -607,42 +607,46 @@ msgstr "" msgid "For now this work is only available for our subscribers." msgstr "" -#: catalogue/templates/catalogue/book_text.html:32 +#: catalogue/templates/catalogue/book_text.html:41 msgid "Table of contents" msgstr "Table of contents" -#: catalogue/templates/catalogue/book_text.html:44 +#: catalogue/templates/catalogue/book_text.html:53 msgid "Edit. note" msgstr "Edit. note" -#: catalogue/templates/catalogue/book_text.html:50 +#: catalogue/templates/catalogue/book_text.html:59 msgid "Infobox" msgstr "Infobox" -#: catalogue/templates/catalogue/book_text.html:55 +#: catalogue/templates/catalogue/book_text.html:64 msgid "Numbering" msgstr "" -#: catalogue/templates/catalogue/book_text.html:59 +#: catalogue/templates/catalogue/book_text.html:68 #, fuzzy #| msgid "Don't show footnotes" msgid "Footnotes" msgstr "Don't show footnotes" -#: catalogue/templates/catalogue/book_text.html:82 +#: catalogue/templates/catalogue/book_text.html:70 +msgid "References" +msgstr "" + +#: catalogue/templates/catalogue/book_text.html:93 #: catalogue/templates/catalogue/viewer_base.html:54 msgid "Close" msgstr "" -#: catalogue/templates/catalogue/book_text.html:83 +#: catalogue/templates/catalogue/book_text.html:94 msgid "Please wait..." msgstr "" -#: catalogue/templates/catalogue/book_text.html:127 +#: catalogue/templates/catalogue/book_text.html:149 msgid "Other versions of the book" msgstr "" -#: catalogue/templates/catalogue/book_text.html:128 +#: catalogue/templates/catalogue/book_text.html:150 msgid "Close the other version" msgstr "" diff --git a/src/catalogue/locale/es/LC_MESSAGES/django.po b/src/catalogue/locale/es/LC_MESSAGES/django.po index c04d892cc..471186066 100644 --- a/src/catalogue/locale/es/LC_MESSAGES/django.po +++ b/src/catalogue/locale/es/LC_MESSAGES/django.po @@ -280,11 +280,11 @@ msgstr "Libro con slug = \"%s\" no existe." msgid "Book %s already exists" msgstr "Libro %s ya existe" -#: catalogue/models/book.py:813 +#: catalogue/models/book.py:853 msgid "This work needs modernisation" msgstr "" -#: catalogue/models/book.py:892 catalogue/models/bookmedia.py:27 +#: catalogue/models/book.py:932 catalogue/models/bookmedia.py:27 #, python-format msgid "%s file" msgstr "%s archivo" @@ -408,7 +408,7 @@ msgid "tags" msgstr "tags" #: catalogue/templates/catalogue/book_detail.html:24 -#: catalogue/templates/catalogue/book_text.html:25 +#: catalogue/templates/catalogue/book_text.html:34 #, fuzzy #| msgid "Other resources" msgid "Other versions" @@ -419,8 +419,8 @@ msgid "See also" msgstr "Véase también" #: catalogue/templates/catalogue/book_detail.html:41 -#: catalogue/templates/catalogue/book_text.html:38 -#: catalogue/templates/catalogue/book_text.html:57 +#: catalogue/templates/catalogue/book_text.html:47 +#: catalogue/templates/catalogue/book_text.html:66 #: catalogue/templates/catalogue/tagged_object_list.html:20 msgid "Themes" msgstr "Temas" @@ -612,43 +612,47 @@ msgstr "" msgid "For now this work is only available for our subscribers." msgstr "" -#: catalogue/templates/catalogue/book_text.html:32 +#: catalogue/templates/catalogue/book_text.html:41 msgid "Table of contents" msgstr "Tabla de contenido" # ! także: N.de la R. -#: catalogue/templates/catalogue/book_text.html:44 +#: catalogue/templates/catalogue/book_text.html:53 msgid "Edit. note" msgstr "Nota de la redacción" -#: catalogue/templates/catalogue/book_text.html:50 +#: catalogue/templates/catalogue/book_text.html:59 msgid "Infobox" msgstr "Infobox" -#: catalogue/templates/catalogue/book_text.html:55 +#: catalogue/templates/catalogue/book_text.html:64 msgid "Numbering" msgstr "" -#: catalogue/templates/catalogue/book_text.html:59 +#: catalogue/templates/catalogue/book_text.html:68 #, fuzzy #| msgid "Don't show footnotes" msgid "Footnotes" msgstr "No mostres notas a pie de página" -#: catalogue/templates/catalogue/book_text.html:82 +#: catalogue/templates/catalogue/book_text.html:70 +msgid "References" +msgstr "" + +#: catalogue/templates/catalogue/book_text.html:93 #: catalogue/templates/catalogue/viewer_base.html:54 msgid "Close" msgstr "" -#: catalogue/templates/catalogue/book_text.html:83 +#: catalogue/templates/catalogue/book_text.html:94 msgid "Please wait..." msgstr "" -#: catalogue/templates/catalogue/book_text.html:127 +#: catalogue/templates/catalogue/book_text.html:149 msgid "Other versions of the book" msgstr "" -#: catalogue/templates/catalogue/book_text.html:128 +#: catalogue/templates/catalogue/book_text.html:150 msgid "Close the other version" msgstr "" diff --git a/src/catalogue/locale/fr/LC_MESSAGES/django.po b/src/catalogue/locale/fr/LC_MESSAGES/django.po index 56b36cdb2..f7fe633b9 100644 --- a/src/catalogue/locale/fr/LC_MESSAGES/django.po +++ b/src/catalogue/locale/fr/LC_MESSAGES/django.po @@ -279,11 +279,11 @@ msgstr "Livre \"%s\" n'existe pas." msgid "Book %s already exists" msgstr "Livre %s existe déjà" -#: catalogue/models/book.py:813 +#: catalogue/models/book.py:853 msgid "This work needs modernisation" msgstr "" -#: catalogue/models/book.py:892 catalogue/models/bookmedia.py:27 +#: catalogue/models/book.py:932 catalogue/models/bookmedia.py:27 #, python-format msgid "%s file" msgstr "fichier %s" @@ -407,7 +407,7 @@ msgid "tags" msgstr "tags" #: catalogue/templates/catalogue/book_detail.html:24 -#: catalogue/templates/catalogue/book_text.html:25 +#: catalogue/templates/catalogue/book_text.html:34 #, fuzzy #| msgid "Other resources" msgid "Other versions" @@ -418,8 +418,8 @@ msgid "See also" msgstr "Voir aussi" #: catalogue/templates/catalogue/book_detail.html:41 -#: catalogue/templates/catalogue/book_text.html:38 -#: catalogue/templates/catalogue/book_text.html:57 +#: catalogue/templates/catalogue/book_text.html:47 +#: catalogue/templates/catalogue/book_text.html:66 #: catalogue/templates/catalogue/tagged_object_list.html:20 msgid "Themes" msgstr "Thèmes" @@ -606,42 +606,46 @@ msgstr "" msgid "For now this work is only available for our subscribers." msgstr "" -#: catalogue/templates/catalogue/book_text.html:32 +#: catalogue/templates/catalogue/book_text.html:41 msgid "Table of contents" msgstr "Table des matières" -#: catalogue/templates/catalogue/book_text.html:44 +#: catalogue/templates/catalogue/book_text.html:53 msgid "Edit. note" msgstr "Note d'éditeur" -#: catalogue/templates/catalogue/book_text.html:50 +#: catalogue/templates/catalogue/book_text.html:59 msgid "Infobox" msgstr "Infobox" -#: catalogue/templates/catalogue/book_text.html:55 +#: catalogue/templates/catalogue/book_text.html:64 msgid "Numbering" msgstr "" -#: catalogue/templates/catalogue/book_text.html:59 +#: catalogue/templates/catalogue/book_text.html:68 #, fuzzy #| msgid "Don't show footnotes" msgid "Footnotes" msgstr "Ne montre pas d'annotations" -#: catalogue/templates/catalogue/book_text.html:82 +#: catalogue/templates/catalogue/book_text.html:70 +msgid "References" +msgstr "" + +#: catalogue/templates/catalogue/book_text.html:93 #: catalogue/templates/catalogue/viewer_base.html:54 msgid "Close" msgstr "" -#: catalogue/templates/catalogue/book_text.html:83 +#: catalogue/templates/catalogue/book_text.html:94 msgid "Please wait..." msgstr "" -#: catalogue/templates/catalogue/book_text.html:127 +#: catalogue/templates/catalogue/book_text.html:149 msgid "Other versions of the book" msgstr "" -#: catalogue/templates/catalogue/book_text.html:128 +#: catalogue/templates/catalogue/book_text.html:150 msgid "Close the other version" msgstr "" diff --git a/src/catalogue/locale/it/LC_MESSAGES/django.po b/src/catalogue/locale/it/LC_MESSAGES/django.po index f0e2c6cb6..c3af4c21e 100644 --- a/src/catalogue/locale/it/LC_MESSAGES/django.po +++ b/src/catalogue/locale/it/LC_MESSAGES/django.po @@ -280,11 +280,11 @@ msgstr "Il libro \"%s\" non esiste." msgid "Book %s already exists" msgstr "Il libro %s esiste già" -#: catalogue/models/book.py:813 +#: catalogue/models/book.py:853 msgid "This work needs modernisation" msgstr "" -#: catalogue/models/book.py:892 catalogue/models/bookmedia.py:27 +#: catalogue/models/book.py:932 catalogue/models/bookmedia.py:27 #, python-format msgid "%s file" msgstr "i %s di file" @@ -407,7 +407,7 @@ msgid "tags" msgstr "i tag" #: catalogue/templates/catalogue/book_detail.html:24 -#: catalogue/templates/catalogue/book_text.html:25 +#: catalogue/templates/catalogue/book_text.html:34 #, fuzzy #| msgid "Other resources" msgid "Other versions" @@ -418,8 +418,8 @@ msgid "See also" msgstr "Vedi anche" #: catalogue/templates/catalogue/book_detail.html:41 -#: catalogue/templates/catalogue/book_text.html:38 -#: catalogue/templates/catalogue/book_text.html:57 +#: catalogue/templates/catalogue/book_text.html:47 +#: catalogue/templates/catalogue/book_text.html:66 #: catalogue/templates/catalogue/tagged_object_list.html:20 msgid "Themes" msgstr "Temi" @@ -609,42 +609,46 @@ msgstr "" msgid "For now this work is only available for our subscribers." msgstr "" -#: catalogue/templates/catalogue/book_text.html:32 +#: catalogue/templates/catalogue/book_text.html:41 msgid "Table of contents" msgstr "Indice" -#: catalogue/templates/catalogue/book_text.html:44 +#: catalogue/templates/catalogue/book_text.html:53 msgid "Edit. note" msgstr "Modifica. nota" -#: catalogue/templates/catalogue/book_text.html:50 +#: catalogue/templates/catalogue/book_text.html:59 msgid "Infobox" msgstr "Infobox" -#: catalogue/templates/catalogue/book_text.html:55 +#: catalogue/templates/catalogue/book_text.html:64 msgid "Numbering" msgstr "" -#: catalogue/templates/catalogue/book_text.html:59 +#: catalogue/templates/catalogue/book_text.html:68 #, fuzzy #| msgid "Don't show footnotes" msgid "Footnotes" msgstr "Non mostrare le note" -#: catalogue/templates/catalogue/book_text.html:82 +#: catalogue/templates/catalogue/book_text.html:70 +msgid "References" +msgstr "" + +#: catalogue/templates/catalogue/book_text.html:93 #: catalogue/templates/catalogue/viewer_base.html:54 msgid "Close" msgstr "" -#: catalogue/templates/catalogue/book_text.html:83 +#: catalogue/templates/catalogue/book_text.html:94 msgid "Please wait..." msgstr "" -#: catalogue/templates/catalogue/book_text.html:127 +#: catalogue/templates/catalogue/book_text.html:149 msgid "Other versions of the book" msgstr "" -#: catalogue/templates/catalogue/book_text.html:128 +#: catalogue/templates/catalogue/book_text.html:150 msgid "Close the other version" msgstr "" diff --git a/src/catalogue/locale/lt/LC_MESSAGES/django.po b/src/catalogue/locale/lt/LC_MESSAGES/django.po index 955441058..101965025 100644 --- a/src/catalogue/locale/lt/LC_MESSAGES/django.po +++ b/src/catalogue/locale/lt/LC_MESSAGES/django.po @@ -281,11 +281,11 @@ msgstr "Knyga \"%s\" neegzistuoja." msgid "Book %s already exists" msgstr "Knyga %s jau egzistuoja" -#: catalogue/models/book.py:813 +#: catalogue/models/book.py:853 msgid "This work needs modernisation" msgstr "" -#: catalogue/models/book.py:892 catalogue/models/bookmedia.py:27 +#: catalogue/models/book.py:932 catalogue/models/bookmedia.py:27 #, python-format msgid "%s file" msgstr "%s failas " @@ -408,7 +408,7 @@ msgid "tags" msgstr "žymės" #: catalogue/templates/catalogue/book_detail.html:24 -#: catalogue/templates/catalogue/book_text.html:25 +#: catalogue/templates/catalogue/book_text.html:34 #, fuzzy #| msgid "Other resources" msgid "Other versions" @@ -419,8 +419,8 @@ msgid "See also" msgstr "Žiūrėti daugiau" #: catalogue/templates/catalogue/book_detail.html:41 -#: catalogue/templates/catalogue/book_text.html:38 -#: catalogue/templates/catalogue/book_text.html:57 +#: catalogue/templates/catalogue/book_text.html:47 +#: catalogue/templates/catalogue/book_text.html:66 #: catalogue/templates/catalogue/tagged_object_list.html:20 msgid "Themes" msgstr "Motyvai" @@ -609,42 +609,46 @@ msgstr "" msgid "For now this work is only available for our subscribers." msgstr "" -#: catalogue/templates/catalogue/book_text.html:32 +#: catalogue/templates/catalogue/book_text.html:41 msgid "Table of contents" msgstr "Turinys" -#: catalogue/templates/catalogue/book_text.html:44 +#: catalogue/templates/catalogue/book_text.html:53 msgid "Edit. note" msgstr "Redaguoti pastabą" -#: catalogue/templates/catalogue/book_text.html:50 +#: catalogue/templates/catalogue/book_text.html:59 msgid "Infobox" msgstr "Infobox" -#: catalogue/templates/catalogue/book_text.html:55 +#: catalogue/templates/catalogue/book_text.html:64 msgid "Numbering" msgstr "" -#: catalogue/templates/catalogue/book_text.html:59 +#: catalogue/templates/catalogue/book_text.html:68 #, fuzzy #| msgid "Don't show footnotes" msgid "Footnotes" msgstr "Nerodyti išnašų" -#: catalogue/templates/catalogue/book_text.html:82 +#: catalogue/templates/catalogue/book_text.html:70 +msgid "References" +msgstr "" + +#: catalogue/templates/catalogue/book_text.html:93 #: catalogue/templates/catalogue/viewer_base.html:54 msgid "Close" msgstr "" -#: catalogue/templates/catalogue/book_text.html:83 +#: catalogue/templates/catalogue/book_text.html:94 msgid "Please wait..." msgstr "" -#: catalogue/templates/catalogue/book_text.html:127 +#: catalogue/templates/catalogue/book_text.html:149 msgid "Other versions of the book" msgstr "" -#: catalogue/templates/catalogue/book_text.html:128 +#: catalogue/templates/catalogue/book_text.html:150 msgid "Close the other version" msgstr "" diff --git a/src/catalogue/locale/ru/LC_MESSAGES/django.po b/src/catalogue/locale/ru/LC_MESSAGES/django.po index 92a4060e2..5a2238bb4 100644 --- a/src/catalogue/locale/ru/LC_MESSAGES/django.po +++ b/src/catalogue/locale/ru/LC_MESSAGES/django.po @@ -280,11 +280,11 @@ msgstr "Книга со slug = \"%s\" не существует." msgid "Book %s already exists" msgstr "Книга %s уже существует" -#: catalogue/models/book.py:813 +#: catalogue/models/book.py:853 msgid "This work needs modernisation" msgstr "" -#: catalogue/models/book.py:892 catalogue/models/bookmedia.py:27 +#: catalogue/models/book.py:932 catalogue/models/bookmedia.py:27 #, fuzzy, python-format msgid "%s file" msgstr "XML файл" @@ -409,7 +409,7 @@ msgid "tags" msgstr "таги" #: catalogue/templates/catalogue/book_detail.html:24 -#: catalogue/templates/catalogue/book_text.html:25 +#: catalogue/templates/catalogue/book_text.html:34 #, fuzzy #| msgid "Other resources" msgid "Other versions" @@ -420,8 +420,8 @@ msgid "See also" msgstr "Подробнее" #: catalogue/templates/catalogue/book_detail.html:41 -#: catalogue/templates/catalogue/book_text.html:38 -#: catalogue/templates/catalogue/book_text.html:57 +#: catalogue/templates/catalogue/book_text.html:47 +#: catalogue/templates/catalogue/book_text.html:66 #: catalogue/templates/catalogue/tagged_object_list.html:20 msgid "Themes" msgstr "Мотивы" @@ -611,42 +611,46 @@ msgstr "" msgid "For now this work is only available for our subscribers." msgstr "" -#: catalogue/templates/catalogue/book_text.html:32 +#: catalogue/templates/catalogue/book_text.html:41 msgid "Table of contents" msgstr "Оглавление" -#: catalogue/templates/catalogue/book_text.html:44 +#: catalogue/templates/catalogue/book_text.html:53 msgid "Edit. note" msgstr "Изменить примечание" -#: catalogue/templates/catalogue/book_text.html:50 +#: catalogue/templates/catalogue/book_text.html:59 msgid "Infobox" msgstr "Инфобокс" -#: catalogue/templates/catalogue/book_text.html:55 +#: catalogue/templates/catalogue/book_text.html:64 msgid "Numbering" msgstr "" -#: catalogue/templates/catalogue/book_text.html:59 +#: catalogue/templates/catalogue/book_text.html:68 #, fuzzy #| msgid "Don't show footnotes" msgid "Footnotes" msgstr "Не показывать сноски" -#: catalogue/templates/catalogue/book_text.html:82 +#: catalogue/templates/catalogue/book_text.html:70 +msgid "References" +msgstr "" + +#: catalogue/templates/catalogue/book_text.html:93 #: catalogue/templates/catalogue/viewer_base.html:54 msgid "Close" msgstr "" -#: catalogue/templates/catalogue/book_text.html:83 +#: catalogue/templates/catalogue/book_text.html:94 msgid "Please wait..." msgstr "" -#: catalogue/templates/catalogue/book_text.html:127 +#: catalogue/templates/catalogue/book_text.html:149 msgid "Other versions of the book" msgstr "" -#: catalogue/templates/catalogue/book_text.html:128 +#: catalogue/templates/catalogue/book_text.html:150 msgid "Close the other version" msgstr "" diff --git a/src/catalogue/locale/uk/LC_MESSAGES/django.po b/src/catalogue/locale/uk/LC_MESSAGES/django.po index 1aca21964..d3787770b 100644 --- a/src/catalogue/locale/uk/LC_MESSAGES/django.po +++ b/src/catalogue/locale/uk/LC_MESSAGES/django.po @@ -279,11 +279,11 @@ msgstr "Книжка \"%s\" не існує." msgid "Book %s already exists" msgstr "Книжка %s вже існує" -#: catalogue/models/book.py:813 +#: catalogue/models/book.py:853 msgid "This work needs modernisation" msgstr "" -#: catalogue/models/book.py:892 catalogue/models/bookmedia.py:27 +#: catalogue/models/book.py:932 catalogue/models/bookmedia.py:27 #, python-format msgid "%s file" msgstr "файл %s" @@ -406,7 +406,7 @@ msgid "tags" msgstr "теґи" #: catalogue/templates/catalogue/book_detail.html:24 -#: catalogue/templates/catalogue/book_text.html:25 +#: catalogue/templates/catalogue/book_text.html:34 #, fuzzy #| msgid "Other resources" msgid "Other versions" @@ -417,8 +417,8 @@ msgid "See also" msgstr "Дивіться також" #: catalogue/templates/catalogue/book_detail.html:41 -#: catalogue/templates/catalogue/book_text.html:38 -#: catalogue/templates/catalogue/book_text.html:57 +#: catalogue/templates/catalogue/book_text.html:47 +#: catalogue/templates/catalogue/book_text.html:66 #: catalogue/templates/catalogue/tagged_object_list.html:20 msgid "Themes" msgstr "Теми" @@ -608,42 +608,46 @@ msgstr "" msgid "For now this work is only available for our subscribers." msgstr "" -#: catalogue/templates/catalogue/book_text.html:32 +#: catalogue/templates/catalogue/book_text.html:41 msgid "Table of contents" msgstr "Зміст" -#: catalogue/templates/catalogue/book_text.html:44 +#: catalogue/templates/catalogue/book_text.html:53 msgid "Edit. note" msgstr "Редакторський коментар" -#: catalogue/templates/catalogue/book_text.html:50 +#: catalogue/templates/catalogue/book_text.html:59 msgid "Infobox" msgstr "Інфобокс" -#: catalogue/templates/catalogue/book_text.html:55 +#: catalogue/templates/catalogue/book_text.html:64 msgid "Numbering" msgstr "" -#: catalogue/templates/catalogue/book_text.html:59 +#: catalogue/templates/catalogue/book_text.html:68 #, fuzzy #| msgid "Don't show footnotes" msgid "Footnotes" msgstr "Сховати примітки" -#: catalogue/templates/catalogue/book_text.html:82 +#: catalogue/templates/catalogue/book_text.html:70 +msgid "References" +msgstr "" + +#: catalogue/templates/catalogue/book_text.html:93 #: catalogue/templates/catalogue/viewer_base.html:54 msgid "Close" msgstr "" -#: catalogue/templates/catalogue/book_text.html:83 +#: catalogue/templates/catalogue/book_text.html:94 msgid "Please wait..." msgstr "" -#: catalogue/templates/catalogue/book_text.html:127 +#: catalogue/templates/catalogue/book_text.html:149 msgid "Other versions of the book" msgstr "" -#: catalogue/templates/catalogue/book_text.html:128 +#: catalogue/templates/catalogue/book_text.html:150 msgid "Close the other version" msgstr "" diff --git a/src/club/admin.py b/src/club/admin.py index 2c56a7327..0cf7d342c 100644 --- a/src/club/admin.py +++ b/src/club/admin.py @@ -79,9 +79,11 @@ class ScheduleInline(admin.TabularInline): class MembershipAdmin(admin.ModelAdmin): - list_display = ['user'] + list_display = ['user', 'manual', 'updated_at', 'notes'] + list_filter = ['manual'] + date_hierarchy = 'updated_at' raw_id_fields = ['user'] - search_fields = ['user__username', 'user__email', 'schedule__email'] + search_fields = ['user__username', 'user__email', 'schedule__email', 'notes'] inlines = [ScheduleInline] admin.site.register(models.Membership, MembershipAdmin) diff --git a/src/club/locale/de/LC_MESSAGES/django.po b/src/club/locale/de/LC_MESSAGES/django.po index 78a9649a2..ae1bb3da9 100644 --- a/src/club/locale/de/LC_MESSAGES/django.po +++ b/src/club/locale/de/LC_MESSAGES/django.po @@ -74,7 +74,7 @@ msgstr "" msgid "email" msgstr "" -#: club/models.py:50 club/models.py:139 +#: club/models.py:50 club/models.py:141 msgid "membership" msgstr "" @@ -122,65 +122,77 @@ msgstr "" msgid "created at" msgstr "" -#: club/models.py:140 +#: club/models.py:135 club/models.py:196 +msgid "name" +msgstr "" + +#: club/models.py:136 +msgid "manual" +msgstr "" + +#: club/models.py:137 +msgid "notes" +msgstr "" + +#: club/models.py:138 +msgid "updated at" +msgstr "" + +#: club/models.py:142 msgid "memberships" msgstr "" -#: club/models.py:162 +#: club/models.py:179 msgid "days before" msgstr "" -#: club/models.py:163 +#: club/models.py:180 msgid "subject" msgstr "" -#: club/models.py:164 club/payu/models.py:140 +#: club/models.py:181 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:167 +#: club/models.py:184 msgid "reminder email" msgstr "" -#: club/models.py:168 +#: club/models.py:185 msgid "reminder emails" msgstr "" -#: club/models.py:173 +#: club/models.py:190 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:175 +#: club/models.py:192 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:179 -msgid "name" -msgstr "" - -#: club/models.py:180 +#: club/models.py:197 msgid "photo" msgstr "" -#: club/models.py:181 +#: club/models.py:198 msgid "text" msgstr "" -#: club/models.py:184 +#: club/models.py:201 msgid "ambassador" msgstr "" -#: club/models.py:185 +#: club/models.py:202 msgid "ambassadors" msgstr "" -#: club/models.py:216 club/templates/club/index.html:7 +#: club/models.py:233 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" diff --git a/src/club/locale/en/LC_MESSAGES/django.po b/src/club/locale/en/LC_MESSAGES/django.po index 78a9649a2..ae1bb3da9 100644 --- a/src/club/locale/en/LC_MESSAGES/django.po +++ b/src/club/locale/en/LC_MESSAGES/django.po @@ -74,7 +74,7 @@ msgstr "" msgid "email" msgstr "" -#: club/models.py:50 club/models.py:139 +#: club/models.py:50 club/models.py:141 msgid "membership" msgstr "" @@ -122,65 +122,77 @@ msgstr "" msgid "created at" msgstr "" -#: club/models.py:140 +#: club/models.py:135 club/models.py:196 +msgid "name" +msgstr "" + +#: club/models.py:136 +msgid "manual" +msgstr "" + +#: club/models.py:137 +msgid "notes" +msgstr "" + +#: club/models.py:138 +msgid "updated at" +msgstr "" + +#: club/models.py:142 msgid "memberships" msgstr "" -#: club/models.py:162 +#: club/models.py:179 msgid "days before" msgstr "" -#: club/models.py:163 +#: club/models.py:180 msgid "subject" msgstr "" -#: club/models.py:164 club/payu/models.py:140 +#: club/models.py:181 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:167 +#: club/models.py:184 msgid "reminder email" msgstr "" -#: club/models.py:168 +#: club/models.py:185 msgid "reminder emails" msgstr "" -#: club/models.py:173 +#: club/models.py:190 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:175 +#: club/models.py:192 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:179 -msgid "name" -msgstr "" - -#: club/models.py:180 +#: club/models.py:197 msgid "photo" msgstr "" -#: club/models.py:181 +#: club/models.py:198 msgid "text" msgstr "" -#: club/models.py:184 +#: club/models.py:201 msgid "ambassador" msgstr "" -#: club/models.py:185 +#: club/models.py:202 msgid "ambassadors" msgstr "" -#: club/models.py:216 club/templates/club/index.html:7 +#: club/models.py:233 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" diff --git a/src/club/locale/es/LC_MESSAGES/django.po b/src/club/locale/es/LC_MESSAGES/django.po index 78a9649a2..ae1bb3da9 100644 --- a/src/club/locale/es/LC_MESSAGES/django.po +++ b/src/club/locale/es/LC_MESSAGES/django.po @@ -74,7 +74,7 @@ msgstr "" msgid "email" msgstr "" -#: club/models.py:50 club/models.py:139 +#: club/models.py:50 club/models.py:141 msgid "membership" msgstr "" @@ -122,65 +122,77 @@ msgstr "" msgid "created at" msgstr "" -#: club/models.py:140 +#: club/models.py:135 club/models.py:196 +msgid "name" +msgstr "" + +#: club/models.py:136 +msgid "manual" +msgstr "" + +#: club/models.py:137 +msgid "notes" +msgstr "" + +#: club/models.py:138 +msgid "updated at" +msgstr "" + +#: club/models.py:142 msgid "memberships" msgstr "" -#: club/models.py:162 +#: club/models.py:179 msgid "days before" msgstr "" -#: club/models.py:163 +#: club/models.py:180 msgid "subject" msgstr "" -#: club/models.py:164 club/payu/models.py:140 +#: club/models.py:181 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:167 +#: club/models.py:184 msgid "reminder email" msgstr "" -#: club/models.py:168 +#: club/models.py:185 msgid "reminder emails" msgstr "" -#: club/models.py:173 +#: club/models.py:190 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:175 +#: club/models.py:192 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:179 -msgid "name" -msgstr "" - -#: club/models.py:180 +#: club/models.py:197 msgid "photo" msgstr "" -#: club/models.py:181 +#: club/models.py:198 msgid "text" msgstr "" -#: club/models.py:184 +#: club/models.py:201 msgid "ambassador" msgstr "" -#: club/models.py:185 +#: club/models.py:202 msgid "ambassadors" msgstr "" -#: club/models.py:216 club/templates/club/index.html:7 +#: club/models.py:233 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" diff --git a/src/club/locale/fr/LC_MESSAGES/django.po b/src/club/locale/fr/LC_MESSAGES/django.po index 0693f0868..b6540a7a8 100644 --- a/src/club/locale/fr/LC_MESSAGES/django.po +++ b/src/club/locale/fr/LC_MESSAGES/django.po @@ -74,7 +74,7 @@ msgstr "" msgid "email" msgstr "" -#: club/models.py:50 club/models.py:139 +#: club/models.py:50 club/models.py:141 msgid "membership" msgstr "" @@ -122,65 +122,77 @@ msgstr "" msgid "created at" msgstr "" -#: club/models.py:140 +#: club/models.py:135 club/models.py:196 +msgid "name" +msgstr "" + +#: club/models.py:136 +msgid "manual" +msgstr "" + +#: club/models.py:137 +msgid "notes" +msgstr "" + +#: club/models.py:138 +msgid "updated at" +msgstr "" + +#: club/models.py:142 msgid "memberships" msgstr "" -#: club/models.py:162 +#: club/models.py:179 msgid "days before" msgstr "" -#: club/models.py:163 +#: club/models.py:180 msgid "subject" msgstr "" -#: club/models.py:164 club/payu/models.py:140 +#: club/models.py:181 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:167 +#: club/models.py:184 msgid "reminder email" msgstr "" -#: club/models.py:168 +#: club/models.py:185 msgid "reminder emails" msgstr "" -#: club/models.py:173 +#: club/models.py:190 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:175 +#: club/models.py:192 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:179 -msgid "name" -msgstr "" - -#: club/models.py:180 +#: club/models.py:197 msgid "photo" msgstr "" -#: club/models.py:181 +#: club/models.py:198 msgid "text" msgstr "" -#: club/models.py:184 +#: club/models.py:201 msgid "ambassador" msgstr "" -#: club/models.py:185 +#: club/models.py:202 msgid "ambassadors" msgstr "" -#: club/models.py:216 club/templates/club/index.html:7 +#: club/models.py:233 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" diff --git a/src/club/locale/it/LC_MESSAGES/django.po b/src/club/locale/it/LC_MESSAGES/django.po index 78a9649a2..ae1bb3da9 100644 --- a/src/club/locale/it/LC_MESSAGES/django.po +++ b/src/club/locale/it/LC_MESSAGES/django.po @@ -74,7 +74,7 @@ msgstr "" msgid "email" msgstr "" -#: club/models.py:50 club/models.py:139 +#: club/models.py:50 club/models.py:141 msgid "membership" msgstr "" @@ -122,65 +122,77 @@ msgstr "" msgid "created at" msgstr "" -#: club/models.py:140 +#: club/models.py:135 club/models.py:196 +msgid "name" +msgstr "" + +#: club/models.py:136 +msgid "manual" +msgstr "" + +#: club/models.py:137 +msgid "notes" +msgstr "" + +#: club/models.py:138 +msgid "updated at" +msgstr "" + +#: club/models.py:142 msgid "memberships" msgstr "" -#: club/models.py:162 +#: club/models.py:179 msgid "days before" msgstr "" -#: club/models.py:163 +#: club/models.py:180 msgid "subject" msgstr "" -#: club/models.py:164 club/payu/models.py:140 +#: club/models.py:181 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:167 +#: club/models.py:184 msgid "reminder email" msgstr "" -#: club/models.py:168 +#: club/models.py:185 msgid "reminder emails" msgstr "" -#: club/models.py:173 +#: club/models.py:190 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:175 +#: club/models.py:192 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:179 -msgid "name" -msgstr "" - -#: club/models.py:180 +#: club/models.py:197 msgid "photo" msgstr "" -#: club/models.py:181 +#: club/models.py:198 msgid "text" msgstr "" -#: club/models.py:184 +#: club/models.py:201 msgid "ambassador" msgstr "" -#: club/models.py:185 +#: club/models.py:202 msgid "ambassadors" msgstr "" -#: club/models.py:216 club/templates/club/index.html:7 +#: club/models.py:233 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" diff --git a/src/club/locale/lt/LC_MESSAGES/django.po b/src/club/locale/lt/LC_MESSAGES/django.po index 5189e4296..11618bbdb 100644 --- a/src/club/locale/lt/LC_MESSAGES/django.po +++ b/src/club/locale/lt/LC_MESSAGES/django.po @@ -76,7 +76,7 @@ msgstr "" msgid "email" msgstr "" -#: club/models.py:50 club/models.py:139 +#: club/models.py:50 club/models.py:141 msgid "membership" msgstr "" @@ -124,65 +124,77 @@ msgstr "" msgid "created at" msgstr "" -#: club/models.py:140 +#: club/models.py:135 club/models.py:196 +msgid "name" +msgstr "" + +#: club/models.py:136 +msgid "manual" +msgstr "" + +#: club/models.py:137 +msgid "notes" +msgstr "" + +#: club/models.py:138 +msgid "updated at" +msgstr "" + +#: club/models.py:142 msgid "memberships" msgstr "" -#: club/models.py:162 +#: club/models.py:179 msgid "days before" msgstr "" -#: club/models.py:163 +#: club/models.py:180 msgid "subject" msgstr "" -#: club/models.py:164 club/payu/models.py:140 +#: club/models.py:181 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:167 +#: club/models.py:184 msgid "reminder email" msgstr "" -#: club/models.py:168 +#: club/models.py:185 msgid "reminder emails" msgstr "" -#: club/models.py:173 +#: club/models.py:190 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:175 +#: club/models.py:192 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:179 -msgid "name" -msgstr "" - -#: club/models.py:180 +#: club/models.py:197 msgid "photo" msgstr "" -#: club/models.py:181 +#: club/models.py:198 msgid "text" msgstr "" -#: club/models.py:184 +#: club/models.py:201 msgid "ambassador" msgstr "" -#: club/models.py:185 +#: club/models.py:202 msgid "ambassadors" msgstr "" -#: club/models.py:216 club/templates/club/index.html:7 +#: club/models.py:233 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" diff --git a/src/club/locale/pl/LC_MESSAGES/django.mo b/src/club/locale/pl/LC_MESSAGES/django.mo index 523170542e1770c63a18c5b956ea4f169c9987f2..9bce02c802a8801bdb85cd69967a28206df98484 100644 GIT binary patch delta 2090 zcmYk-e@Inl9LMo*rQTU;=9c}~s%y<^*)6YHsms|)TR+^gR%WtH!tm+Q5uO?h+n6g1$aK41Lez*Su^(GVtk4PxZnk|46MdH+>Cr|ABS1E zA74fv)9`c5#B;a-`%~?K-J_z89-=yWg5@}Y3$UEK^uPvG0!MKseucR>fO_B%>i(NJ z9q;1|e1ha`<2Vm>k*;k%W^1TRsN~ZS#Twj#v+*;Wi{Bvk+7K4wFh+0;HA#g$Mc*sJ z6Ig?*aRj6IAM#aOm6b}U0yW@TOw&}?QPBf-ssWo&9XF$HJm5Tx^kqHHlc>bcq7oiJ z&B%|=Tc~~>p!#`))9_zZ0^=Cy!UPp{JU!bi2lH_b7NVxE3YAzbs>5xlDXe$ybM8ka z5J!El2Mh6IT!P=Co-=}a&M%sOt>vGtVGPxA23OV5Ow`PTQHicVCA0>WP!;O?8{PHo zuDt;@!X_M?!e+#`InSq4CDe*xJeAA*E7JiQG~z3$2VO_+vD>cwcU0z2QHf-*94R5XIes2l#qehj_D#=}e4fjR6jJ@6xB zmF!bgLVc)__q*$tP!GD|{NA-+ciu(~^taS`V1H53RE^^@EFcR_@m6G(Y&Ysb2T*Hz z(4BW8gS2jB|JrG1A8JosL_T)awckMPl~Gi}4{(Ow|Ho9c)?=s4^;GuO)gPR*1Lvn_^zw75>`cIYW-F8%4pO4U-U@A&M-5M6kFJT|x^fBlpKFYeQI?3mZ`p=Vt` S4|V(T_9KZ{+&bEmci3}RcfVo) delta 1922 zcmZ|PYfQ~?9LMo*bU{v%YHOm?^eokukT~nalLRHA%(;^T-1p zIr0P>bL|1cEDypO&1Ei|X@;43e~zDL{C2+o*YE#7|MUBOf4~3tfA0FuWCdQtg*O{* zDUnFr>S0!o>mxYOd{Jhr(2pbW7$##YM&eV9!xz{KKVyIVfy1yb7sD|fdt)XRV$PrI z0oz7L1MNZ$v=66X3l7JJs0lxz5{PA#ewdB1ScICe0`>c~*ax>`H10!kv7|AGu@|=);wmiAPYIbPaXiO>Dqtn1$8M?#JWECA))4 z=n)4k_&J6%zje{k1n+bKzn}*GhWgrpju0kyK5s0DOjF1|r6 zAen5nfLhf38}SSV8tAO0lNQf&!NaHt!>A~B)1pxc4MD9u3H5y%Y9haLn!8@?EJv+$ zg*&f9?bJ3*!?VZ^2ds?_i?=7JiC&|g=?8cI1*tFl?u;aT7103HN>VuJ`#e-_%ta+u zhI+KiQ3=Kt z6C_xR`WI|1Up~=K_ozPT_Im9?(F`+h}(2h(b z^jAKO@Dpmqgmz7jgk914&E|!UX4GEj*{UA0h;pI_p+Zs{ODrX35_&x|h`EHCwt50l zNO*~SLa&}4l`3D4IEknr)Y3yo?ou_XsaR$a`U4qHsQM=nYDGk8sAska^=@Yeo1>~D zj(JL&$~-@tDq|ML_;NG-IbOdnFFPm0Hz62|xf9iNFrhN|J|RCWe#`Bv+c(#4*jiUp OYnwJy?Wn6+W4{5B3ZY^E diff --git a/src/club/locale/pl/LC_MESSAGES/django.po b/src/club/locale/pl/LC_MESSAGES/django.po index 0d72d5bf6..43a31fb81 100644 --- a/src/club/locale/pl/LC_MESSAGES/django.po +++ b/src/club/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2020-09-17 10:37+0200\n" +"PO-Revision-Date: 2020-11-26 12:47+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: pl\n" @@ -76,7 +76,7 @@ msgstr "klucz" msgid "email" msgstr "email" -#: club/models.py:50 club/models.py:139 +#: club/models.py:50 club/models.py:141 msgid "membership" msgstr "członkostwo" @@ -124,31 +124,47 @@ msgstr "użytkownik" msgid "created at" msgstr "utworzone" -#: club/models.py:140 +#: club/models.py:135 club/models.py:196 +msgid "name" +msgstr "nazwisko" + +#: club/models.py:136 +msgid "manual" +msgstr "ustawiony ręcznie" + +#: club/models.py:137 +msgid "notes" +msgstr "notatki" + +#: club/models.py:138 +msgid "updated at" +msgstr "aktualizacja" + +#: club/models.py:142 msgid "memberships" msgstr "członkostwa" -#: club/models.py:162 +#: club/models.py:179 msgid "days before" msgstr "dni przed" -#: club/models.py:163 +#: club/models.py:180 msgid "subject" msgstr "temat" -#: club/models.py:164 club/payu/models.py:140 +#: club/models.py:181 club/payu/models.py:140 msgid "body" msgstr "treść" -#: club/models.py:167 +#: club/models.py:184 msgid "reminder email" msgstr "email z przypomnieniem" -#: club/models.py:168 +#: club/models.py:185 msgid "reminder emails" msgstr "emaile z przypomnieniem" -#: club/models.py:173 +#: club/models.py:190 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" @@ -157,7 +173,7 @@ msgstr[1] "%d dni przed wygaśnięciem" msgstr[2] "%d dni przed wygaśnięciem" msgstr[3] "%d dni przed wygaśnięciem" -#: club/models.py:175 +#: club/models.py:192 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" @@ -166,27 +182,23 @@ msgstr[1] "%d dni po wygaśnięciu" msgstr[2] "%d dni po wygaśnięciu" msgstr[3] "%d dni przed wygaśnięciem" -#: club/models.py:179 -msgid "name" -msgstr "nazwisko" - -#: club/models.py:180 +#: club/models.py:197 msgid "photo" msgstr "zdjęcie" -#: club/models.py:181 +#: club/models.py:198 msgid "text" msgstr "tekst" -#: club/models.py:184 +#: club/models.py:201 msgid "ambassador" msgstr "ambasador" -#: club/models.py:185 +#: club/models.py:202 msgid "ambassadors" msgstr "ambasadorowie" -#: club/models.py:216 club/templates/club/index.html:7 +#: club/models.py:233 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" diff --git a/src/club/locale/ru/LC_MESSAGES/django.po b/src/club/locale/ru/LC_MESSAGES/django.po index d6e04cb20..bc85ffa59 100644 --- a/src/club/locale/ru/LC_MESSAGES/django.po +++ b/src/club/locale/ru/LC_MESSAGES/django.po @@ -76,7 +76,7 @@ msgstr "" msgid "email" msgstr "" -#: club/models.py:50 club/models.py:139 +#: club/models.py:50 club/models.py:141 msgid "membership" msgstr "" @@ -124,65 +124,77 @@ msgstr "" msgid "created at" msgstr "" -#: club/models.py:140 +#: club/models.py:135 club/models.py:196 +msgid "name" +msgstr "" + +#: club/models.py:136 +msgid "manual" +msgstr "" + +#: club/models.py:137 +msgid "notes" +msgstr "" + +#: club/models.py:138 +msgid "updated at" +msgstr "" + +#: club/models.py:142 msgid "memberships" msgstr "" -#: club/models.py:162 +#: club/models.py:179 msgid "days before" msgstr "" -#: club/models.py:163 +#: club/models.py:180 msgid "subject" msgstr "" -#: club/models.py:164 club/payu/models.py:140 +#: club/models.py:181 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:167 +#: club/models.py:184 msgid "reminder email" msgstr "" -#: club/models.py:168 +#: club/models.py:185 msgid "reminder emails" msgstr "" -#: club/models.py:173 +#: club/models.py:190 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:175 +#: club/models.py:192 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:179 -msgid "name" -msgstr "" - -#: club/models.py:180 +#: club/models.py:197 msgid "photo" msgstr "" -#: club/models.py:181 +#: club/models.py:198 msgid "text" msgstr "" -#: club/models.py:184 +#: club/models.py:201 msgid "ambassador" msgstr "" -#: club/models.py:185 +#: club/models.py:202 msgid "ambassadors" msgstr "" -#: club/models.py:216 club/templates/club/index.html:7 +#: club/models.py:233 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" diff --git a/src/club/locale/uk/LC_MESSAGES/django.po b/src/club/locale/uk/LC_MESSAGES/django.po index a5819ba9a..4bb56cb1b 100644 --- a/src/club/locale/uk/LC_MESSAGES/django.po +++ b/src/club/locale/uk/LC_MESSAGES/django.po @@ -77,7 +77,7 @@ msgstr "" msgid "email" msgstr "" -#: club/models.py:50 club/models.py:139 +#: club/models.py:50 club/models.py:141 msgid "membership" msgstr "" @@ -125,65 +125,77 @@ msgstr "" msgid "created at" msgstr "" -#: club/models.py:140 +#: club/models.py:135 club/models.py:196 +msgid "name" +msgstr "" + +#: club/models.py:136 +msgid "manual" +msgstr "" + +#: club/models.py:137 +msgid "notes" +msgstr "" + +#: club/models.py:138 +msgid "updated at" +msgstr "" + +#: club/models.py:142 msgid "memberships" msgstr "" -#: club/models.py:162 +#: club/models.py:179 msgid "days before" msgstr "" -#: club/models.py:163 +#: club/models.py:180 msgid "subject" msgstr "" -#: club/models.py:164 club/payu/models.py:140 +#: club/models.py:181 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:167 +#: club/models.py:184 msgid "reminder email" msgstr "" -#: club/models.py:168 +#: club/models.py:185 msgid "reminder emails" msgstr "" -#: club/models.py:173 +#: club/models.py:190 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:175 +#: club/models.py:192 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:179 -msgid "name" -msgstr "" - -#: club/models.py:180 +#: club/models.py:197 msgid "photo" msgstr "" -#: club/models.py:181 +#: club/models.py:198 msgid "text" msgstr "" -#: club/models.py:184 +#: club/models.py:201 msgid "ambassador" msgstr "" -#: club/models.py:185 +#: club/models.py:202 msgid "ambassadors" msgstr "" -#: club/models.py:216 club/templates/club/index.html:7 +#: club/models.py:233 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" diff --git a/src/club/models.py b/src/club/models.py index 1a691440f..7147d474c 100644 --- a/src/club/models.py +++ b/src/club/models.py @@ -132,8 +132,10 @@ class Membership(models.Model): """ Represents a user being recognized as a member of the club. """ user = models.OneToOneField(settings.AUTH_USER_MODEL, verbose_name=_('user'), on_delete=models.CASCADE) created_at = models.DateTimeField(_('created at'), auto_now_add=True) - name = models.CharField(max_length=255, blank=True) - honorary = models.BooleanField(default=False) + name = models.CharField(_('name'), max_length=255, blank=True) + manual = models.BooleanField(_('manual'), default=False) + notes = models.CharField(_('notes'), max_length=2048, blank=True) + updated_at = models.DateField(_('updated at'), auto_now=True, blank=True) class Meta: verbose_name = _('membership') @@ -142,6 +144,21 @@ class Membership(models.Model): def __str__(self): return str(self.user) + def save(self, *args, **kwargs): + super().save(*args, **kwargs) + self.update_contact() + + def update_contact(self): + email = self.user.email + if not email: + return + + Contact = apps.get_model('messaging', 'Contact') + if self.manual: + Contact.update(email, Level.MANUAL_MEMBER, self.updated_at) + else: + Contact.reset(email) + @classmethod def is_active_for(cls, user): if user.is_anonymous: diff --git a/src/messaging/locale/de/LC_MESSAGES/django.po b/src/messaging/locale/de/LC_MESSAGES/django.po index e06fdfdc4..18861a069 100644 --- a/src/messaging/locale/de/LC_MESSAGES/django.po +++ b/src/messaging/locale/de/LC_MESSAGES/django.po @@ -38,11 +38,11 @@ msgstr "" msgid "state" msgstr "" -#: messaging/models.py:17 messaging/models.py:171 +#: messaging/models.py:17 messaging/models.py:185 msgid "subject" msgstr "" -#: messaging/models.py:18 messaging/models.py:172 +#: messaging/models.py:18 messaging/models.py:186 msgid "body" msgstr "" @@ -127,46 +127,50 @@ msgid "Recurring donor" msgstr "" #: messaging/models.py:115 +msgid "Manually set as member" +msgstr "" + +#: messaging/models.py:116 msgid "Opt out" msgstr "" -#: messaging/models.py:122 +#: messaging/models.py:123 msgid "contact" msgstr "" -#: messaging/models.py:123 +#: messaging/models.py:124 msgid "contacts" msgstr "" -#: messaging/models.py:175 +#: messaging/models.py:189 msgid "email sent" msgstr "" -#: messaging/models.py:176 +#: messaging/models.py:190 msgid "emails sent" msgstr "" -#: messaging/states.py:75 +#: messaging/states.py:76 msgid "club one-time donors" msgstr "" -#: messaging/states.py:90 +#: messaging/states.py:91 msgid "club one-time donors with donation expiring" msgstr "" -#: messaging/states.py:104 +#: messaging/states.py:105 msgid "club would-be donors" msgstr "" -#: messaging/states.py:116 +#: messaging/states.py:117 msgid "club recurring donors" msgstr "" -#: messaging/states.py:131 +#: messaging/states.py:132 msgid "club recurring donors with donation expired" msgstr "" -#: messaging/states.py:146 +#: messaging/states.py:147 msgid "cold group" msgstr "" diff --git a/src/messaging/locale/en/LC_MESSAGES/django.po b/src/messaging/locale/en/LC_MESSAGES/django.po index e06fdfdc4..18861a069 100644 --- a/src/messaging/locale/en/LC_MESSAGES/django.po +++ b/src/messaging/locale/en/LC_MESSAGES/django.po @@ -38,11 +38,11 @@ msgstr "" msgid "state" msgstr "" -#: messaging/models.py:17 messaging/models.py:171 +#: messaging/models.py:17 messaging/models.py:185 msgid "subject" msgstr "" -#: messaging/models.py:18 messaging/models.py:172 +#: messaging/models.py:18 messaging/models.py:186 msgid "body" msgstr "" @@ -127,46 +127,50 @@ msgid "Recurring donor" msgstr "" #: messaging/models.py:115 +msgid "Manually set as member" +msgstr "" + +#: messaging/models.py:116 msgid "Opt out" msgstr "" -#: messaging/models.py:122 +#: messaging/models.py:123 msgid "contact" msgstr "" -#: messaging/models.py:123 +#: messaging/models.py:124 msgid "contacts" msgstr "" -#: messaging/models.py:175 +#: messaging/models.py:189 msgid "email sent" msgstr "" -#: messaging/models.py:176 +#: messaging/models.py:190 msgid "emails sent" msgstr "" -#: messaging/states.py:75 +#: messaging/states.py:76 msgid "club one-time donors" msgstr "" -#: messaging/states.py:90 +#: messaging/states.py:91 msgid "club one-time donors with donation expiring" msgstr "" -#: messaging/states.py:104 +#: messaging/states.py:105 msgid "club would-be donors" msgstr "" -#: messaging/states.py:116 +#: messaging/states.py:117 msgid "club recurring donors" msgstr "" -#: messaging/states.py:131 +#: messaging/states.py:132 msgid "club recurring donors with donation expired" msgstr "" -#: messaging/states.py:146 +#: messaging/states.py:147 msgid "cold group" msgstr "" diff --git a/src/messaging/locale/es/LC_MESSAGES/django.po b/src/messaging/locale/es/LC_MESSAGES/django.po index e06fdfdc4..18861a069 100644 --- a/src/messaging/locale/es/LC_MESSAGES/django.po +++ b/src/messaging/locale/es/LC_MESSAGES/django.po @@ -38,11 +38,11 @@ msgstr "" msgid "state" msgstr "" -#: messaging/models.py:17 messaging/models.py:171 +#: messaging/models.py:17 messaging/models.py:185 msgid "subject" msgstr "" -#: messaging/models.py:18 messaging/models.py:172 +#: messaging/models.py:18 messaging/models.py:186 msgid "body" msgstr "" @@ -127,46 +127,50 @@ msgid "Recurring donor" msgstr "" #: messaging/models.py:115 +msgid "Manually set as member" +msgstr "" + +#: messaging/models.py:116 msgid "Opt out" msgstr "" -#: messaging/models.py:122 +#: messaging/models.py:123 msgid "contact" msgstr "" -#: messaging/models.py:123 +#: messaging/models.py:124 msgid "contacts" msgstr "" -#: messaging/models.py:175 +#: messaging/models.py:189 msgid "email sent" msgstr "" -#: messaging/models.py:176 +#: messaging/models.py:190 msgid "emails sent" msgstr "" -#: messaging/states.py:75 +#: messaging/states.py:76 msgid "club one-time donors" msgstr "" -#: messaging/states.py:90 +#: messaging/states.py:91 msgid "club one-time donors with donation expiring" msgstr "" -#: messaging/states.py:104 +#: messaging/states.py:105 msgid "club would-be donors" msgstr "" -#: messaging/states.py:116 +#: messaging/states.py:117 msgid "club recurring donors" msgstr "" -#: messaging/states.py:131 +#: messaging/states.py:132 msgid "club recurring donors with donation expired" msgstr "" -#: messaging/states.py:146 +#: messaging/states.py:147 msgid "cold group" msgstr "" diff --git a/src/messaging/locale/fr/LC_MESSAGES/django.po b/src/messaging/locale/fr/LC_MESSAGES/django.po index 5686054c0..71406a9ae 100644 --- a/src/messaging/locale/fr/LC_MESSAGES/django.po +++ b/src/messaging/locale/fr/LC_MESSAGES/django.po @@ -38,11 +38,11 @@ msgstr "" msgid "state" msgstr "" -#: messaging/models.py:17 messaging/models.py:171 +#: messaging/models.py:17 messaging/models.py:185 msgid "subject" msgstr "" -#: messaging/models.py:18 messaging/models.py:172 +#: messaging/models.py:18 messaging/models.py:186 msgid "body" msgstr "" @@ -127,46 +127,50 @@ msgid "Recurring donor" msgstr "" #: messaging/models.py:115 +msgid "Manually set as member" +msgstr "" + +#: messaging/models.py:116 msgid "Opt out" msgstr "" -#: messaging/models.py:122 +#: messaging/models.py:123 msgid "contact" msgstr "" -#: messaging/models.py:123 +#: messaging/models.py:124 msgid "contacts" msgstr "" -#: messaging/models.py:175 +#: messaging/models.py:189 msgid "email sent" msgstr "" -#: messaging/models.py:176 +#: messaging/models.py:190 msgid "emails sent" msgstr "" -#: messaging/states.py:75 +#: messaging/states.py:76 msgid "club one-time donors" msgstr "" -#: messaging/states.py:90 +#: messaging/states.py:91 msgid "club one-time donors with donation expiring" msgstr "" -#: messaging/states.py:104 +#: messaging/states.py:105 msgid "club would-be donors" msgstr "" -#: messaging/states.py:116 +#: messaging/states.py:117 msgid "club recurring donors" msgstr "" -#: messaging/states.py:131 +#: messaging/states.py:132 msgid "club recurring donors with donation expired" msgstr "" -#: messaging/states.py:146 +#: messaging/states.py:147 msgid "cold group" msgstr "" diff --git a/src/messaging/locale/it/LC_MESSAGES/django.po b/src/messaging/locale/it/LC_MESSAGES/django.po index e06fdfdc4..18861a069 100644 --- a/src/messaging/locale/it/LC_MESSAGES/django.po +++ b/src/messaging/locale/it/LC_MESSAGES/django.po @@ -38,11 +38,11 @@ msgstr "" msgid "state" msgstr "" -#: messaging/models.py:17 messaging/models.py:171 +#: messaging/models.py:17 messaging/models.py:185 msgid "subject" msgstr "" -#: messaging/models.py:18 messaging/models.py:172 +#: messaging/models.py:18 messaging/models.py:186 msgid "body" msgstr "" @@ -127,46 +127,50 @@ msgid "Recurring donor" msgstr "" #: messaging/models.py:115 +msgid "Manually set as member" +msgstr "" + +#: messaging/models.py:116 msgid "Opt out" msgstr "" -#: messaging/models.py:122 +#: messaging/models.py:123 msgid "contact" msgstr "" -#: messaging/models.py:123 +#: messaging/models.py:124 msgid "contacts" msgstr "" -#: messaging/models.py:175 +#: messaging/models.py:189 msgid "email sent" msgstr "" -#: messaging/models.py:176 +#: messaging/models.py:190 msgid "emails sent" msgstr "" -#: messaging/states.py:75 +#: messaging/states.py:76 msgid "club one-time donors" msgstr "" -#: messaging/states.py:90 +#: messaging/states.py:91 msgid "club one-time donors with donation expiring" msgstr "" -#: messaging/states.py:104 +#: messaging/states.py:105 msgid "club would-be donors" msgstr "" -#: messaging/states.py:116 +#: messaging/states.py:117 msgid "club recurring donors" msgstr "" -#: messaging/states.py:131 +#: messaging/states.py:132 msgid "club recurring donors with donation expired" msgstr "" -#: messaging/states.py:146 +#: messaging/states.py:147 msgid "cold group" msgstr "" diff --git a/src/messaging/locale/lt/LC_MESSAGES/django.po b/src/messaging/locale/lt/LC_MESSAGES/django.po index 52f56d3cb..6f663f7c5 100644 --- a/src/messaging/locale/lt/LC_MESSAGES/django.po +++ b/src/messaging/locale/lt/LC_MESSAGES/django.po @@ -40,11 +40,11 @@ msgstr "" msgid "state" msgstr "" -#: messaging/models.py:17 messaging/models.py:171 +#: messaging/models.py:17 messaging/models.py:185 msgid "subject" msgstr "" -#: messaging/models.py:18 messaging/models.py:172 +#: messaging/models.py:18 messaging/models.py:186 msgid "body" msgstr "" @@ -129,46 +129,50 @@ msgid "Recurring donor" msgstr "" #: messaging/models.py:115 +msgid "Manually set as member" +msgstr "" + +#: messaging/models.py:116 msgid "Opt out" msgstr "" -#: messaging/models.py:122 +#: messaging/models.py:123 msgid "contact" msgstr "" -#: messaging/models.py:123 +#: messaging/models.py:124 msgid "contacts" msgstr "" -#: messaging/models.py:175 +#: messaging/models.py:189 msgid "email sent" msgstr "" -#: messaging/models.py:176 +#: messaging/models.py:190 msgid "emails sent" msgstr "" -#: messaging/states.py:75 +#: messaging/states.py:76 msgid "club one-time donors" msgstr "" -#: messaging/states.py:90 +#: messaging/states.py:91 msgid "club one-time donors with donation expiring" msgstr "" -#: messaging/states.py:104 +#: messaging/states.py:105 msgid "club would-be donors" msgstr "" -#: messaging/states.py:116 +#: messaging/states.py:117 msgid "club recurring donors" msgstr "" -#: messaging/states.py:131 +#: messaging/states.py:132 msgid "club recurring donors with donation expired" msgstr "" -#: messaging/states.py:146 +#: messaging/states.py:147 msgid "cold group" msgstr "" diff --git a/src/messaging/locale/pl/LC_MESSAGES/django.mo b/src/messaging/locale/pl/LC_MESSAGES/django.mo index 119350a7c17c954f13d670e85e995b05ff353575..e51a57c19057fe7f12a201ab65a0e8b7af829095 100644 GIT binary patch delta 1052 zcmYk*Jxo(k7{>8air7-rf_4f2(Y&lk1X{nzz zlpbOmQ3x1w92e_&P+kU&smD27i?47!RH9sNRvt9COm^W)EKtnU0Z)*`#)eK z>zh?xwBR??4uAR`#{5Ao7-pL~K|4k;fl)k+>QAG_owe=fZM$dNZy-~dJE(Q;;R~|- zK>e(5PBB^&jPOuuMo}MTu>*^^4rg&EKDGT-bf|ws<}%+=C;f%WSQC$<*oHKj5!831 zcn&XONey$nXy9uc!X-R{@y6OlE?6(4HsIj_ypImP!CqWNr9MiUv|t={ko~rvLS^!# zbvQ!)mC7+1-tA-NY9Et@hI-c-P7P6=h+st?a-(M2oHKC*DPD zSN((@wsfQZf^k9@ODEb&Y$pCMN@)`jEk6q;S~FfTGdX$P$-4z7lXtRicHEt+ECj#S zMUu(hzLb;fJJz47%r}e&0*A^@=wQd-%=_Cp?@BITn9e!Hd?7PEk@H+<>fNJDGv0(- J84jHe{sk@vV6p%J delta 984 zcmYk*KTK0m6vy#X9+pZ)1i{L`TK*`1Y6S`y5H^A^7O&%Nip`|iExJ^m$D6S>{$(iNk15sk!L z#B3P9mGDE`2+T_H1D4?@yo_5I#qaKK&u^pdD_|uaVGK|3Dh51E^Agx@ma`-s-Ebc@ z@ga`l6TFCPs0H8QZQR5G+{f@i7tS`A#2WIgn8rb@#Tg&J^y}}jocvcTV}1KUM;rL# z7j{q!7EmWBVjLr^b_FX?*ORDu8PDJK{J7^IBU5b}b+B37q`EKsdJB_dtZ!*LDosD? z#tE#zN7#Z>o?pZi<2T4N>?7)gpHY?ii9`4o`Lj4l-B*K8vBAglsCln2H%VuS&LHlg zHc&@>WHV|5o!E^JFomx%gX^f0|3WRehnjcj<07hpCvG`qR0ZqZbe#HEkr*MtJvQk+ zL*-|Dyx=Y(uif6FO1p$qG;Dld;ls6&Byl6mp8ebcZA?wywbn`z`u^-1bP)+cr=bX8 zd9+Y7q1H;&g*~%N*iPsh_}}#UI(*QCHwhg;t(s63_1|^Abuwts7u`naed|Q^#C76) v(>vs#R=NBo=*S-j2PN^I-b{8V)!TP3JCH9#pGSi1o&M#qSWkW>HXfV;itI;| diff --git a/src/messaging/locale/pl/LC_MESSAGES/django.po b/src/messaging/locale/pl/LC_MESSAGES/django.po index f351d0eb7..be8024989 100644 --- a/src/messaging/locale/pl/LC_MESSAGES/django.po +++ b/src/messaging/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2020-01-29 13:25+0100\n" +"PO-Revision-Date: 2020-11-26 12:56+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: pl\n" @@ -17,7 +17,7 @@ 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" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.3\n" #: messaging/admin.py:16 msgid "E-mail content" @@ -41,11 +41,11 @@ msgstr "" msgid "state" msgstr "stan" -#: messaging/models.py:17 messaging/models.py:171 +#: messaging/models.py:17 messaging/models.py:185 msgid "subject" msgstr "temat" -#: messaging/models.py:18 messaging/models.py:172 +#: messaging/models.py:18 messaging/models.py:186 msgid "body" msgstr "treść" @@ -130,46 +130,50 @@ msgid "Recurring donor" msgstr "Darczyńca z wpłatą cykliczną" #: messaging/models.py:115 +msgid "Manually set as member" +msgstr "Członkostwo ustawione ręcznie" + +#: messaging/models.py:116 msgid "Opt out" msgstr "Opt-out" -#: messaging/models.py:122 +#: messaging/models.py:123 msgid "contact" msgstr "kontakt" -#: messaging/models.py:123 +#: messaging/models.py:124 msgid "contacts" msgstr "kontakty" -#: messaging/models.py:175 +#: messaging/models.py:189 msgid "email sent" msgstr "wysłany e-mail" -#: messaging/models.py:176 +#: messaging/models.py:190 msgid "emails sent" msgstr "wysłane e-maile" -#: messaging/states.py:75 +#: messaging/states.py:76 msgid "club one-time donors" msgstr "darczyńcy z jednorazową wpłatą" -#: messaging/states.py:90 +#: messaging/states.py:91 msgid "club one-time donors with donation expiring" msgstr "darczyńcy z wygasającą jednorazową wpłatą" -#: messaging/states.py:104 +#: messaging/states.py:105 msgid "club would-be donors" msgstr "niedoszli darczyńcy" -#: messaging/states.py:116 +#: messaging/states.py:117 msgid "club recurring donors" msgstr "darczyńcy z wpłatą cykluczną" -#: messaging/states.py:131 +#: messaging/states.py:132 msgid "club recurring donors with donation expired" msgstr "darczyńcy z wygasającą wpłatą cykliczną" -#: messaging/states.py:146 +#: messaging/states.py:147 msgid "cold group" msgstr "lodówka" diff --git a/src/messaging/locale/ru/LC_MESSAGES/django.po b/src/messaging/locale/ru/LC_MESSAGES/django.po index 3a4877425..f7a597a3f 100644 --- a/src/messaging/locale/ru/LC_MESSAGES/django.po +++ b/src/messaging/locale/ru/LC_MESSAGES/django.po @@ -40,11 +40,11 @@ msgstr "" msgid "state" msgstr "" -#: messaging/models.py:17 messaging/models.py:171 +#: messaging/models.py:17 messaging/models.py:185 msgid "subject" msgstr "" -#: messaging/models.py:18 messaging/models.py:172 +#: messaging/models.py:18 messaging/models.py:186 msgid "body" msgstr "" @@ -129,46 +129,50 @@ msgid "Recurring donor" msgstr "" #: messaging/models.py:115 +msgid "Manually set as member" +msgstr "" + +#: messaging/models.py:116 msgid "Opt out" msgstr "" -#: messaging/models.py:122 +#: messaging/models.py:123 msgid "contact" msgstr "" -#: messaging/models.py:123 +#: messaging/models.py:124 msgid "contacts" msgstr "" -#: messaging/models.py:175 +#: messaging/models.py:189 msgid "email sent" msgstr "" -#: messaging/models.py:176 +#: messaging/models.py:190 msgid "emails sent" msgstr "" -#: messaging/states.py:75 +#: messaging/states.py:76 msgid "club one-time donors" msgstr "" -#: messaging/states.py:90 +#: messaging/states.py:91 msgid "club one-time donors with donation expiring" msgstr "" -#: messaging/states.py:104 +#: messaging/states.py:105 msgid "club would-be donors" msgstr "" -#: messaging/states.py:116 +#: messaging/states.py:117 msgid "club recurring donors" msgstr "" -#: messaging/states.py:131 +#: messaging/states.py:132 msgid "club recurring donors with donation expired" msgstr "" -#: messaging/states.py:146 +#: messaging/states.py:147 msgid "cold group" msgstr "" diff --git a/src/messaging/locale/uk/LC_MESSAGES/django.po b/src/messaging/locale/uk/LC_MESSAGES/django.po index 5a536f3bb..b13796579 100644 --- a/src/messaging/locale/uk/LC_MESSAGES/django.po +++ b/src/messaging/locale/uk/LC_MESSAGES/django.po @@ -41,11 +41,11 @@ msgstr "" msgid "state" msgstr "" -#: messaging/models.py:17 messaging/models.py:171 +#: messaging/models.py:17 messaging/models.py:185 msgid "subject" msgstr "" -#: messaging/models.py:18 messaging/models.py:172 +#: messaging/models.py:18 messaging/models.py:186 msgid "body" msgstr "" @@ -130,46 +130,50 @@ msgid "Recurring donor" msgstr "" #: messaging/models.py:115 +msgid "Manually set as member" +msgstr "" + +#: messaging/models.py:116 msgid "Opt out" msgstr "" -#: messaging/models.py:122 +#: messaging/models.py:123 msgid "contact" msgstr "" -#: messaging/models.py:123 +#: messaging/models.py:124 msgid "contacts" msgstr "" -#: messaging/models.py:175 +#: messaging/models.py:189 msgid "email sent" msgstr "" -#: messaging/models.py:176 +#: messaging/models.py:190 msgid "emails sent" msgstr "" -#: messaging/states.py:75 +#: messaging/states.py:76 msgid "club one-time donors" msgstr "" -#: messaging/states.py:90 +#: messaging/states.py:91 msgid "club one-time donors with donation expiring" msgstr "" -#: messaging/states.py:104 +#: messaging/states.py:105 msgid "club would-be donors" msgstr "" -#: messaging/states.py:116 +#: messaging/states.py:117 msgid "club recurring donors" msgstr "" -#: messaging/states.py:131 +#: messaging/states.py:132 msgid "club recurring donors with donation expired" msgstr "" -#: messaging/states.py:146 +#: messaging/states.py:147 msgid "cold group" msgstr "" diff --git a/src/messaging/models.py b/src/messaging/models.py index d598fc852..7891e0c63 100644 --- a/src/messaging/models.py +++ b/src/messaging/models.py @@ -112,6 +112,7 @@ class Contact(models.Model): (Level.TRIED, _('Would-be donor')), (Level.SINGLE, _('One-time donor')), (Level.RECURRING, _('Recurring donor')), + (Level.MANUAL_MEMBER, _('Manually set as member')), (Level.OPT_OUT, _('Opt out')), ]) since = models.DateTimeField() @@ -163,6 +164,16 @@ class Contact(models.Model): self.expires_at = expires_at self.save() + @classmethod + def reset(cls, email): + cls.objects.filter(email=email).delete() + Schedule = apps.get_model('club', 'Schedule') + Membership = apps.get_model('club', 'Membership') + for schedule in Schedule.objects.filter(email=email): + schedule.update_contact() + for membership in Membership.objects.filter(manual=True, user__email=email): + membership.update_contact() + def wl_optout_url(self): return 'https://wolnelektury.pl' + self.get_optout_url() diff --git a/src/messaging/states.py b/src/messaging/states.py index c0f3c7ef2..4105caf5a 100644 --- a/src/messaging/states.py +++ b/src/messaging/states.py @@ -9,6 +9,7 @@ class Level: TRIED = 20 SINGLE = 30 RECURRING = 40 + MANUAL_MEMBER = 45 OPT_OUT = 50 diff --git a/src/wolnelektury/locale/de/LC_MESSAGES/django.po b/src/wolnelektury/locale/de/LC_MESSAGES/django.po index 62b198a1a..07cf97e11 100644 --- a/src/wolnelektury/locale/de/LC_MESSAGES/django.po +++ b/src/wolnelektury/locale/de/LC_MESSAGES/django.po @@ -189,16 +189,21 @@ msgstr "Audiobücher" msgid "All works" msgstr "Alle Bücher" -#: wolnelektury/templates/base/superbase.html:133 +#: wolnelektury/templates/base/superbase.html:127 +#: wolnelektury/templates/main_page.html:92 +msgid "Newsletter" +msgstr "" + +#: wolnelektury/templates/base/superbase.html:136 #: wolnelektury/templates/board_base.html:28 msgid "Search" msgstr "Suchen" -#: wolnelektury/templates/base/superbase.html:164 +#: wolnelektury/templates/base/superbase.html:167 msgid "Close" msgstr "Schließen" -#: wolnelektury/templates/base/superbase.html:166 +#: wolnelektury/templates/base/superbase.html:169 msgid "Loading" msgstr "Laden" @@ -365,10 +370,6 @@ msgstr "Brauchen Sie ein Buch?" msgid "Publishing plan" msgstr "Plan der Veröffentlichung" -#: wolnelektury/templates/main_page.html:92 -msgid "Newsletter" -msgstr "" - #: wolnelektury/templates/main_page.html:97 #, fuzzy msgid "Information" diff --git a/src/wolnelektury/locale/en/LC_MESSAGES/django.po b/src/wolnelektury/locale/en/LC_MESSAGES/django.po index 506f82acc..aef2bb6e3 100644 --- a/src/wolnelektury/locale/en/LC_MESSAGES/django.po +++ b/src/wolnelektury/locale/en/LC_MESSAGES/django.po @@ -188,16 +188,21 @@ msgstr "Audiobooks" msgid "All works" msgstr "All books" -#: wolnelektury/templates/base/superbase.html:133 +#: wolnelektury/templates/base/superbase.html:127 +#: wolnelektury/templates/main_page.html:92 +msgid "Newsletter" +msgstr "" + +#: wolnelektury/templates/base/superbase.html:136 #: wolnelektury/templates/board_base.html:28 msgid "Search" msgstr "Search" -#: wolnelektury/templates/base/superbase.html:164 +#: wolnelektury/templates/base/superbase.html:167 msgid "Close" msgstr "Close" -#: wolnelektury/templates/base/superbase.html:166 +#: wolnelektury/templates/base/superbase.html:169 msgid "Loading" msgstr "Loading" @@ -354,10 +359,6 @@ msgstr "Missing a book?" msgid "Publishing plan" msgstr "Publishing plan" -#: wolnelektury/templates/main_page.html:92 -msgid "Newsletter" -msgstr "" - #: wolnelektury/templates/main_page.html:97 msgid "Information" msgstr "Information" diff --git a/src/wolnelektury/locale/es/LC_MESSAGES/django.po b/src/wolnelektury/locale/es/LC_MESSAGES/django.po index 989e04b8d..5d054b502 100644 --- a/src/wolnelektury/locale/es/LC_MESSAGES/django.po +++ b/src/wolnelektury/locale/es/LC_MESSAGES/django.po @@ -187,16 +187,21 @@ msgstr "Audiolibros" msgid "All works" msgstr "Todos los libros" -#: wolnelektury/templates/base/superbase.html:133 +#: wolnelektury/templates/base/superbase.html:127 +#: wolnelektury/templates/main_page.html:92 +msgid "Newsletter" +msgstr "" + +#: wolnelektury/templates/base/superbase.html:136 #: wolnelektury/templates/board_base.html:28 msgid "Search" msgstr "Buscar" -#: wolnelektury/templates/base/superbase.html:164 +#: wolnelektury/templates/base/superbase.html:167 msgid "Close" msgstr "Cerrar" -#: wolnelektury/templates/base/superbase.html:166 +#: wolnelektury/templates/base/superbase.html:169 msgid "Loading" msgstr "Cargando" @@ -358,10 +363,6 @@ msgstr "¿Falta un libro?" msgid "Publishing plan" msgstr "Plan de publicación" -#: wolnelektury/templates/main_page.html:92 -msgid "Newsletter" -msgstr "" - #: wolnelektury/templates/main_page.html:97 msgid "Information" msgstr "Información" diff --git a/src/wolnelektury/locale/fr/LC_MESSAGES/django.po b/src/wolnelektury/locale/fr/LC_MESSAGES/django.po index 42f030d4a..53d8e6bc5 100644 --- a/src/wolnelektury/locale/fr/LC_MESSAGES/django.po +++ b/src/wolnelektury/locale/fr/LC_MESSAGES/django.po @@ -189,16 +189,21 @@ msgstr "Livres audio" msgid "All works" msgstr "Tous les livres" -#: wolnelektury/templates/base/superbase.html:133 +#: wolnelektury/templates/base/superbase.html:127 +#: wolnelektury/templates/main_page.html:92 +msgid "Newsletter" +msgstr "" + +#: wolnelektury/templates/base/superbase.html:136 #: wolnelektury/templates/board_base.html:28 msgid "Search" msgstr "Rechercher" -#: wolnelektury/templates/base/superbase.html:164 +#: wolnelektury/templates/base/superbase.html:167 msgid "Close" msgstr "Fermer" -#: wolnelektury/templates/base/superbase.html:166 +#: wolnelektury/templates/base/superbase.html:169 msgid "Loading" msgstr "Chargement en cours" @@ -355,10 +360,6 @@ msgstr "Il vous manque un livre?" msgid "Publishing plan" msgstr "Plan de publication" -#: wolnelektury/templates/main_page.html:92 -msgid "Newsletter" -msgstr "" - #: wolnelektury/templates/main_page.html:97 msgid "Information" msgstr "Informations" diff --git a/src/wolnelektury/locale/it/LC_MESSAGES/django.po b/src/wolnelektury/locale/it/LC_MESSAGES/django.po index 5d955ad07..9b4ad7066 100644 --- a/src/wolnelektury/locale/it/LC_MESSAGES/django.po +++ b/src/wolnelektury/locale/it/LC_MESSAGES/django.po @@ -189,16 +189,21 @@ msgstr "Audiolibri" msgid "All works" msgstr "Tutti i libri" -#: wolnelektury/templates/base/superbase.html:133 +#: wolnelektury/templates/base/superbase.html:127 +#: wolnelektury/templates/main_page.html:92 +msgid "Newsletter" +msgstr "" + +#: wolnelektury/templates/base/superbase.html:136 #: wolnelektury/templates/board_base.html:28 msgid "Search" msgstr "Cerca" -#: wolnelektury/templates/base/superbase.html:164 +#: wolnelektury/templates/base/superbase.html:167 msgid "Close" msgstr "Chiudi" -#: wolnelektury/templates/base/superbase.html:166 +#: wolnelektury/templates/base/superbase.html:169 msgid "Loading" msgstr "Caricamento" @@ -347,10 +352,6 @@ msgstr "Manca un libro?" msgid "Publishing plan" msgstr "Programma editoriale" -#: wolnelektury/templates/main_page.html:92 -msgid "Newsletter" -msgstr "" - #: wolnelektury/templates/main_page.html:97 msgid "Information" msgstr "" diff --git a/src/wolnelektury/locale/lt/LC_MESSAGES/django.po b/src/wolnelektury/locale/lt/LC_MESSAGES/django.po index 750593d32..c58248e9c 100644 --- a/src/wolnelektury/locale/lt/LC_MESSAGES/django.po +++ b/src/wolnelektury/locale/lt/LC_MESSAGES/django.po @@ -195,16 +195,21 @@ msgstr "Audio knygos" msgid "All works" msgstr "Visos knygos" -#: wolnelektury/templates/base/superbase.html:133 +#: wolnelektury/templates/base/superbase.html:127 +#: wolnelektury/templates/main_page.html:92 +msgid "Newsletter" +msgstr "" + +#: wolnelektury/templates/base/superbase.html:136 #: wolnelektury/templates/board_base.html:28 msgid "Search" msgstr "Ieškoti" -#: wolnelektury/templates/base/superbase.html:164 +#: wolnelektury/templates/base/superbase.html:167 msgid "Close" msgstr "Uždaryti" -#: wolnelektury/templates/base/superbase.html:166 +#: wolnelektury/templates/base/superbase.html:169 msgid "Loading" msgstr "Kraunasi" @@ -374,10 +379,6 @@ msgstr "Neradote knygos?" msgid "Publishing plan" msgstr "Publikavimo planas" -#: wolnelektury/templates/main_page.html:92 -msgid "Newsletter" -msgstr "" - #: wolnelektury/templates/main_page.html:97 msgid "Information" msgstr "Informacija" diff --git a/src/wolnelektury/locale/pl/LC_MESSAGES/django.po b/src/wolnelektury/locale/pl/LC_MESSAGES/django.po index a91b6330e..6835c74d6 100644 --- a/src/wolnelektury/locale/pl/LC_MESSAGES/django.po +++ b/src/wolnelektury/locale/pl/LC_MESSAGES/django.po @@ -182,16 +182,21 @@ msgstr "Audiobooki" msgid "All works" msgstr "Wszystkie utwory" -#: wolnelektury/templates/base/superbase.html:133 +#: wolnelektury/templates/base/superbase.html:127 +#: wolnelektury/templates/main_page.html:92 +msgid "Newsletter" +msgstr "Newsletter" + +#: wolnelektury/templates/base/superbase.html:136 #: wolnelektury/templates/board_base.html:28 msgid "Search" msgstr "Szukaj" -#: wolnelektury/templates/base/superbase.html:164 +#: wolnelektury/templates/base/superbase.html:167 msgid "Close" msgstr "Zamknij" -#: wolnelektury/templates/base/superbase.html:166 +#: wolnelektury/templates/base/superbase.html:169 msgid "Loading" msgstr "Ładowanie" @@ -334,10 +339,6 @@ msgstr "Nie znalazłeś/-aś utworu?" msgid "Publishing plan" msgstr "Plan publikacji" -#: wolnelektury/templates/main_page.html:92 -msgid "Newsletter" -msgstr "Newsletter" - #: wolnelektury/templates/main_page.html:97 msgid "Information" msgstr "Informacje" diff --git a/src/wolnelektury/locale/ru/LC_MESSAGES/django.po b/src/wolnelektury/locale/ru/LC_MESSAGES/django.po index 7dc469023..204e07875 100644 --- a/src/wolnelektury/locale/ru/LC_MESSAGES/django.po +++ b/src/wolnelektury/locale/ru/LC_MESSAGES/django.po @@ -196,16 +196,21 @@ msgstr "Аудиокниги" msgid "All works" msgstr "Все книги" -#: wolnelektury/templates/base/superbase.html:133 +#: wolnelektury/templates/base/superbase.html:127 +#: wolnelektury/templates/main_page.html:92 +msgid "Newsletter" +msgstr "" + +#: wolnelektury/templates/base/superbase.html:136 #: wolnelektury/templates/board_base.html:28 msgid "Search" msgstr "Поиск" -#: wolnelektury/templates/base/superbase.html:164 +#: wolnelektury/templates/base/superbase.html:167 msgid "Close" msgstr "Закройте" -#: wolnelektury/templates/base/superbase.html:166 +#: wolnelektury/templates/base/superbase.html:169 msgid "Loading" msgstr "Погрузка" @@ -373,10 +378,6 @@ msgstr "Потеряли книгу?" msgid "Publishing plan" msgstr "Издательский план" -#: wolnelektury/templates/main_page.html:92 -msgid "Newsletter" -msgstr "" - #: wolnelektury/templates/main_page.html:97 msgid "Information" msgstr "Информация" diff --git a/src/wolnelektury/locale/uk/LC_MESSAGES/django.po b/src/wolnelektury/locale/uk/LC_MESSAGES/django.po index 46140fbe0..461a9f29d 100644 --- a/src/wolnelektury/locale/uk/LC_MESSAGES/django.po +++ b/src/wolnelektury/locale/uk/LC_MESSAGES/django.po @@ -193,16 +193,21 @@ msgstr "Аудіокниги" msgid "All works" msgstr "Всі книжки" -#: wolnelektury/templates/base/superbase.html:133 +#: wolnelektury/templates/base/superbase.html:127 +#: wolnelektury/templates/main_page.html:92 +msgid "Newsletter" +msgstr "" + +#: wolnelektury/templates/base/superbase.html:136 #: wolnelektury/templates/board_base.html:28 msgid "Search" msgstr "Пошук" -#: wolnelektury/templates/base/superbase.html:164 +#: wolnelektury/templates/base/superbase.html:167 msgid "Close" msgstr "Закрити" -#: wolnelektury/templates/base/superbase.html:166 +#: wolnelektury/templates/base/superbase.html:169 msgid "Loading" msgstr "Завантажується" @@ -372,10 +377,6 @@ msgstr "Не знайшли книжки?" msgid "Publishing plan" msgstr "План публікації" -#: wolnelektury/templates/main_page.html:92 -msgid "Newsletter" -msgstr "" - #: wolnelektury/templates/main_page.html:97 msgid "Information" msgstr "інформація" -- 2.20.1