Upgrades

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index fa2d531..9f2340d 100644 (file)
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,7 +1,7 @@
 -i https://py.mdrn.pl/simple/
 
 # django
 -i https://py.mdrn.pl/simple/
 
 # django

-Django==2.2.28
+Django==3.2.16

 fnpdjango==0.6
 docutils==0.16
 
 fnpdjango==0.6
 docutils==0.16
 


@@ -12,14 +12,14 @@ jsmin==3.0.1
 fnp-django-pagination==2.2.5
 django-modeltranslation==0.18.2
 django-allauth==0.51
 fnp-django-pagination==2.2.5
 django-modeltranslation==0.18.2
 django-allauth==0.51

-django-extensions==3.1.1
+django-extensions==3.1.5

 djangorestframework==3.13.1
 djangorestframework-xml==2.0.0
 django-admin-ordering==0.14.0
 django-machina==1.1.6
 django-countries==7.3.2
 
 djangorestframework==3.13.1
 djangorestframework-xml==2.0.0
 django-admin-ordering==0.14.0
 django-machina==1.1.6
 django-countries==7.3.2
 

-# A version compatible with Django 2.2, with long help text and editable max_length.
+# A version compatible with Django 2.2+, with long help text and editable max_length.

 -e git+https://github.com/rczajka/django-forms-builder@6bdb2345cfc02ebf7e0fb049e43e4e0a38b52940#egg=django-forms-builder
 
 
 -e git+https://github.com/rczajka/django-forms-builder@6bdb2345cfc02ebf7e0fb049e43e4e0a38b52940#egg=django-forms-builder
 
 


@@ -41,7 +41,7 @@ Feedparser==6.0.10
 
 Pillow==9.2.0
 mutagen==1.45.1
 
 Pillow==9.2.0
 mutagen==1.45.1

-sorl-thumbnail==12.7.0
+sorl-thumbnail==12.8.0

 
 # home-brewed & dependencies
 librarian==2.4.1
 
 # home-brewed & dependencies
 librarian==2.4.1

diff --git a/src/ajaxable/utils.py b/src/ajaxable/utils.py
index f8e99ce..23a350f 100644 (file)
--- a/src/ajaxable/utils.py
+++ b/src/ajaxable/utils.py
@@ -9,7 +9,7 @@ from django.shortcuts import render
 from django.utils.encoding import force_text
 from django.utils.functional import Promise
 from django.utils.http import urlquote_plus
 from django.utils.encoding import force_text
 from django.utils.functional import Promise
 from django.utils.http import urlquote_plus

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from django.views.decorators.vary import vary_on_headers
 from honeypot.decorators import verify_honeypot_value
 
 from django.views.decorators.vary import vary_on_headers
 from honeypot.decorators import verify_honeypot_value
 

diff --git a/src/annoy/models.py b/src/annoy/models.py
index 5a613f1..c8fdf2d 100644 (file)
--- a/src/annoy/models.py
+++ b/src/annoy/models.py
@@ -2,7 +2,7 @@ from django.apps import apps
 from django.conf import settings
 from django.db import models
 from django.template import Context, Template
 from django.conf import settings
 from django.db import models
 from django.template import Context, Template

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from django.utils.timezone import now
 from .places import PLACES, PLACE_CHOICES, STYLES
 
 from django.utils.timezone import now
 from .places import PLACES, PLACE_CHOICES, STYLES
 

diff --git a/src/annoy/places.py b/src/annoy/places.py
index 7663a61..adcf3dc 100644 (file)
--- a/src/annoy/places.py
+++ b/src/annoy/places.py
@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 PLACE_DEFINITIONS = [
     ('top', _('Top of all pages.'), True),
 
 PLACE_DEFINITIONS = [
     ('top', _('Top of all pages.'), True),

diff --git a/src/api/models.py b/src/api/models.py
index 28bc880..eb234ad 100644 (file)
--- a/src/api/models.py
+++ b/src/api/models.py
@@ -6,7 +6,7 @@ from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.db.models.signals import pre_delete
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.db.models.signals import pre_delete

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 from catalogue.models import Book, Tag
 
 
 from catalogue.models import Book, Tag
 

diff --git a/src/catalogue/constants.py b/src/catalogue/constants.py
index 6925880..6ee7c97 100644 (file)
--- a/src/catalogue/constants.py
+++ b/src/catalogue/constants.py
@@ -1,7 +1,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 LICENSES = {
     'http://creativecommons.org/licenses/by-sa/3.0/': {
 
 LICENSES = {
     'http://creativecommons.org/licenses/by-sa/3.0/': {

diff --git a/src/catalogue/forms.py b/src/catalogue/forms.py
index 0e5b4d1..f124f31 100644 (file)
--- a/src/catalogue/forms.py
+++ b/src/catalogue/forms.py
@@ -2,7 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 from catalogue.models import Book
 from waiter.models import WaitedFile
 
 from catalogue.models import Book
 from waiter.models import WaitedFile

diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py
index fc07fc5..c03f7a3 100644 (file)
--- a/src/catalogue/models/book.py
+++ b/src/catalogue/models/book.py
@@ -15,7 +15,7 @@ import django.dispatch
 from django.contrib.contenttypes.fields import GenericRelation
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.contrib.contenttypes.fields import GenericRelation
 from django.template.loader import render_to_string
 from django.urls import reverse

-from django.utils.translation import ugettext_lazy as _, get_language
+from django.utils.translation import gettext_lazy as _, get_language

 from fnpdjango.storage import BofhFileSystemStorage
 from lxml import html
 from librarian.cover import WLCover
 from fnpdjango.storage import BofhFileSystemStorage
 from lxml import html
 from librarian.cover import WLCover

diff --git a/src/catalogue/models/bookmedia.py b/src/catalogue/models/bookmedia.py
index 5419405..dc02d61 100644 (file)
--- a/src/catalogue/models/bookmedia.py
+++ b/src/catalogue/models/bookmedia.py
@@ -5,7 +5,7 @@ from collections import OrderedDict
 import json
 from collections import namedtuple
 from django.db import models
 import json
 from collections import namedtuple
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from slugify import slugify
 import mutagen
 from mutagen import id3
 from slugify import slugify
 import mutagen
 from mutagen import id3

diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py
index 6f956c7..2f64b79 100644 (file)
--- a/src/catalogue/models/collection.py
+++ b/src/catalogue/models/collection.py
@@ -4,7 +4,7 @@
 from django.conf import settings
 from django.db import models
 from django.urls import reverse
 from django.conf import settings
 from django.db import models
 from django.urls import reverse

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 import re
 from wolnelektury.utils import cached_render, clear_cached_renders
 
 import re
 from wolnelektury.utils import cached_render, clear_cached_renders
 

diff --git a/src/catalogue/models/fragment.py b/src/catalogue/models/fragment.py
index ac0c539..9ee48c9 100644 (file)
--- a/src/catalogue/models/fragment.py
+++ b/src/catalogue/models/fragment.py
@@ -5,7 +5,7 @@ from django.conf import settings
 from django.contrib.contenttypes.fields import GenericRelation
 from django.urls import reverse
 from django.db import models
 from django.contrib.contenttypes.fields import GenericRelation
 from django.urls import reverse
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from newtagging import managers
 from catalogue.models import Tag
 from wolnelektury.utils import cached_render, clear_cached_renders
 from newtagging import managers
 from catalogue.models import Tag
 from wolnelektury.utils import cached_render, clear_cached_renders

diff --git a/src/catalogue/models/source.py b/src/catalogue/models/source.py
index 77b1a67..ee024e0 100644 (file)
--- a/src/catalogue/models/source.py
+++ b/src/catalogue/models/source.py
@@ -2,7 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.db import models
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 
 class Source(models.Model):
 
 
 class Source(models.Model):

diff --git a/src/catalogue/models/tag.py b/src/catalogue/models/tag.py
index acf0252..740b84b 100644 (file)
--- a/src/catalogue/models/tag.py
+++ b/src/catalogue/models/tag.py
@@ -11,7 +11,7 @@ from django.db import models
 from django.db.models.query import Prefetch
 from django.dispatch import Signal
 from django.urls import reverse
 from django.db.models.query import Prefetch
 from django.dispatch import Signal
 from django.urls import reverse

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 from newtagging.models import TagManager, TaggedItemManager
 
 
 from newtagging.models import TagManager, TaggedItemManager
 


@@ -73,7 +73,7 @@ class Tag(models.Model):
     created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
     changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
 
     created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
     changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
 

-    after_change = Signal(providing_args=['instance'])
+    after_change = Signal()

 
     intermediary_table_model = TagRelation
     objects = TagManager()
 
     intermediary_table_model = TagRelation
     objects = TagManager()

diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py
index cddd273..24210b8 100644 (file)
--- a/src/catalogue/templatetags/catalogue_tags.py
+++ b/src/catalogue/templatetags/catalogue_tags.py
@@ -11,7 +11,7 @@ from django.template import Node, Variable, Template, Context
 from django.urls import reverse
 from django.utils.cache import add_never_cache_headers
 from django.utils.safestring import mark_safe
 from django.urls import reverse
 from django.utils.cache import add_never_cache_headers
 from django.utils.safestring import mark_safe

-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _

 
 from catalogue.helpers import get_audiobook_tags
 from catalogue.models import Book, BookMedia, Fragment, Tag, Source
 
 from catalogue.helpers import get_audiobook_tags
 from catalogue.models import Book, BookMedia, Fragment, Tag, Source

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 816836d..5a32932 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -14,7 +14,7 @@ from django.db.models import Q, QuerySet
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.utils.http import urlquote_plus
 from django.utils import translation
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.utils.http import urlquote_plus
 from django.utils import translation

-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy

 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView


@@ -421,8 +421,8 @@ def download_zip(request, file_format=None, media_format=None, slug=None):
 
 class CustomPDFFormView(AjaxableFormView):
     form_class = forms.CustomPDFForm
 
 class CustomPDFFormView(AjaxableFormView):
     form_class = forms.CustomPDFForm

-    title = ugettext_lazy('Download custom PDF')
-    submit = ugettext_lazy('Download')
+    title = gettext_lazy('Download custom PDF')
+    submit = gettext_lazy('Download')

     template = 'catalogue/custom_pdf_form.html'
     honeypot = True
 
     template = 'catalogue/custom_pdf_form.html'
     honeypot = True
 

diff --git a/src/chunks/models.py b/src/chunks/models.py
index 881cc52..e1ed94d 100644 (file)
--- a/src/chunks/models.py
+++ b/src/chunks/models.py
@@ -6,7 +6,7 @@ from django.core.cache import cache
 from django.db import models
 from django.urls import reverse
 from django.utils.safestring import mark_safe
 from django.db import models
 from django.urls import reverse
 from django.utils.safestring import mark_safe

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 
 class Chunk(models.Model):
 
 
 class Chunk(models.Model):

diff --git a/src/club/apps.py b/src/club/apps.py
index 44a257c..6da6c08 100644 (file)
--- a/src/club/apps.py
+++ b/src/club/apps.py
@@ -2,7 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.apps import AppConfig
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.apps import AppConfig

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 
 class ClubConfig(AppConfig):
 
 
 class ClubConfig(AppConfig):

diff --git a/src/club/forms.py b/src/club/forms.py
index 2347e2a..75213fc 100644 (file)
--- a/src/club/forms.py
+++ b/src/club/forms.py
@@ -3,7 +3,7 @@
 #
 from decimal import Decimal
 from django import forms
 #
 from decimal import Decimal
 from django import forms

-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _

 from newsletter.forms import NewsletterForm
 from . import models, payment_methods
 from .payu.forms import CardTokenForm
 from newsletter.forms import NewsletterForm
 from . import models, payment_methods
 from .payu.forms import CardTokenForm

diff --git a/src/club/models.py b/src/club/models.py
index b5df041..1a78d76 100644 (file)
--- a/src/club/models.py
+++ b/src/club/models.py
@@ -12,7 +12,7 @@ from django.urls import reverse
 from django.db import models
 from django import template
 from django.utils.timezone import now
 from django.db import models
 from django import template
 from django.utils.timezone import now

-from django.utils.translation import ugettext_lazy as _, ungettext, ugettext, get_language
+from django.utils.translation import gettext_lazy as _, ngettext, gettext, get_language

 from django_countries.fields import CountryField
 from pytz import utc
 from catalogue.utils import get_random_hash
 from django_countries.fields import CountryField
 from pytz import utc
 from catalogue.utils import get_random_hash

diff --git a/src/club/payu/models.py b/src/club/payu/models.py
index 937d32a..b025bfc 100644 (file)
--- a/src/club/payu/models.py
+++ b/src/club/payu/models.py
@@ -8,7 +8,7 @@ from django.contrib.sites.models import Site
 from django.db import models
 from django.urls import reverse
 from django.utils.timezone import now
 from django.db import models
 from django.urls import reverse
 from django.utils.timezone import now

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from . import POSS
 
 
 from . import POSS
 
 

diff --git a/src/dictionary/constants.py b/src/dictionary/constants.py
index 51fc67b..bc19ed7 100644 (file)
--- a/src/dictionary/constants.py
+++ b/src/dictionary/constants.py
@@ -1,7 +1,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 
 FN_TYPES = {
 
 
 FN_TYPES = {

diff --git a/src/funding/admin.py b/src/funding/admin.py
index 47bc98a..6f29fbc 100644 (file)
--- a/src/funding/admin.py
+++ b/src/funding/admin.py
@@ -1,7 +1,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 from fnpdjango.actions import export_as_csv_action
 from django.contrib import admin
 from modeltranslation.admin import TranslationAdmin
 from fnpdjango.actions import export_as_csv_action

diff --git a/src/funding/forms.py b/src/funding/forms.py
index 22d1a30..e055faf 100644 (file)
--- a/src/funding/forms.py
+++ b/src/funding/forms.py
@@ -4,7 +4,7 @@
 from django import forms
 from django.utils import formats
 from django.utils.safestring import mark_safe
 from django import forms
 from django.utils import formats
 from django.utils.safestring import mark_safe

-from django.utils.translation import ugettext_lazy as _, ugettext, get_language
+from django.utils.translation import gettext_lazy as _, gettext, get_language

 
 from newsletter.forms import NewsletterForm
 from club.payment_methods import PayU
 
 from newsletter.forms import NewsletterForm
 from club.payment_methods import PayU


@@ -46,13 +46,13 @@ adres e-mail zostanie wykorzystany także w celu przesyłania newslettera Wolnyc
             if isinstance(min_amount, float):
                 min_amount = formats.number_format(min_amount, 2)
             raise forms.ValidationError(
             if isinstance(min_amount, float):
                 min_amount = formats.number_format(min_amount, 2)
             raise forms.ValidationError(

-                ugettext("The minimum amount is %(amount)s PLN.") % {
+                gettext("The minimum amount is %(amount)s PLN.") % {

                     'amount': min_amount})
         return self.cleaned_data['amount']
 
     def clean(self):
         if not self.offer.is_current():
                     'amount': min_amount})
         return self.cleaned_data['amount']
 
     def clean(self):
         if not self.offer.is_current():

-            raise forms.ValidationError(ugettext("This offer is out of date."))
+            raise forms.ValidationError(gettext("This offer is out of date."))

         return self.cleaned_data
 
     def save(self):
         return self.cleaned_data
 
     def save(self):

diff --git a/src/funding/models.py b/src/funding/models.py
index 8dbc711..838d2ab 100644 (file)
--- a/src/funding/models.py
+++ b/src/funding/models.py
@@ -12,7 +12,7 @@ from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.html import mark_safe
 from django.utils.timezone import utc
 from django.urls import reverse
 from django.utils.html import mark_safe
 from django.utils.timezone import utc

-from django.utils.translation import ugettext_lazy as _, override
+from django.utils.translation import gettext_lazy as _, override

 from catalogue.models import Book
 from catalogue.utils import get_random_hash
 from polls.models import Poll
 from catalogue.models import Book
 from catalogue.utils import get_random_hash
 from polls.models import Poll

diff --git a/src/infopages/models.py b/src/infopages/models.py
index 0060a70..e6e4eb7 100644 (file)
--- a/src/infopages/models.py
+++ b/src/infopages/models.py
@@ -3,7 +3,7 @@
 #
 from django.db import models
 from django.urls import reverse
 #
 from django.db import models
 from django.urls import reverse

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 
 class InfoPage(models.Model):
 
 
 class InfoPage(models.Model):

diff --git a/src/isbn/forms.py b/src/isbn/forms.py
index 7d47fb5..f513bd5 100644 (file)
--- a/src/isbn/forms.py
+++ b/src/isbn/forms.py
@@ -6,7 +6,7 @@ import json
 from urllib.request import urlopen
 
 from django import forms
 from urllib.request import urlopen
 
 from django import forms

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from slugify import slugify
 
 from isbn.management.commands.import_onix import UNKNOWN
 from slugify import slugify
 
 from isbn.management.commands.import_onix import UNKNOWN

diff --git a/src/lesmianator/models.py b/src/lesmianator/models.py
index 9e2f166..28dbdba 100644 (file)
--- a/src/lesmianator/models.py
+++ b/src/lesmianator/models.py
@@ -10,7 +10,7 @@ from random import randint
 from django.core.files.base import ContentFile
 from django.db import models
 from django.utils.timezone import utc
 from django.core.files.base import ContentFile
 from django.db import models
 from django.utils.timezone import utc

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey

diff --git a/src/libraries/models.py b/src/libraries/models.py
index 3e80301..56e9b2d 100644 (file)
--- a/src/libraries/models.py
+++ b/src/libraries/models.py
@@ -3,7 +3,7 @@
 #\r
 from django.db import models\r
 from django.urls import reverse\r
 #\r
 from django.db import models\r
 from django.urls import reverse\r

-from django.utils.translation import ugettext_lazy as _\r
+from django.utils.translation import gettext_lazy as _\r

 \r
 \r
 class Catalog(models.Model):\r
 \r
 \r
 class Catalog(models.Model):\r

diff --git a/src/messaging/admin.py b/src/messaging/admin.py
index e01adac..06ed212 100644 (file)
--- a/src/messaging/admin.py
+++ b/src/messaging/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib import messages
 from django.contrib import admin
 from django.contrib import messages

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from fnpdjango.actions import export_as_csv_action
 from . import models
 
 from fnpdjango.actions import export_as_csv_action
 from . import models
 

diff --git a/src/messaging/models.py b/src/messaging/models.py
index 7891e0c..e1b26a8 100644 (file)
--- a/src/messaging/models.py
+++ b/src/messaging/models.py
@@ -6,7 +6,7 @@ from django.db import models
 from django.template import Template, Context
 from django.urls import reverse
 from django.utils.timezone import now, get_current_timezone
 from django.template import Template, Context
 from django.urls import reverse
 from django.utils.timezone import now, get_current_timezone

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from sentry_sdk import capture_exception
 from catalogue.utils import get_random_hash
 from .states import Level, states
 from sentry_sdk import capture_exception
 from catalogue.utils import get_random_hash
 from .states import Level, states

diff --git a/src/messaging/states.py b/src/messaging/states.py
index 4105caf..144d842 100644 (file)
--- a/src/messaging/states.py
+++ b/src/messaging/states.py
@@ -1,7 +1,7 @@
 from datetime import timedelta
 from django.apps import apps
 from django.utils.timezone import now
 from datetime import timedelta
 from django.apps import apps
 from django.utils.timezone import now

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 
 class Level:
 
 
 class Level:

diff --git a/src/messaging/views.py b/src/messaging/views.py
index fc09d72..4290313 100644 (file)
--- a/src/messaging/views.py
+++ b/src/messaging/views.py
@@ -2,7 +2,7 @@ import json
 from django.http import JsonResponse
 from django.urls import reverse
 from django.shortcuts import render
 from django.http import JsonResponse
 from django.urls import reverse
 from django.shortcuts import render

-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _

 from django.views.decorators import cache
 from django.views.generic import DetailView, UpdateView
 from . import models
 from django.views.decorators import cache
 from django.views.generic import DetailView, UpdateView
 from . import models

diff --git a/src/newsletter/forms.py b/src/newsletter/forms.py
index 3f08668..47606a5 100644 (file)
--- a/src/newsletter/forms.py
+++ b/src/newsletter/forms.py
@@ -6,7 +6,7 @@ from django.core.validators import validate_email
 from django.forms import Form, BooleanField
 from django.forms.fields import EmailField
 from django.utils.safestring import mark_safe
 from django.forms import Form, BooleanField
 from django.forms.fields import EmailField
 from django.utils.safestring import mark_safe

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from newsletter.subscribe import subscribe
 from .models import Newsletter
 
 from newsletter.subscribe import subscribe
 from .models import Newsletter
 

diff --git a/src/newsletter/models.py b/src/newsletter/models.py
index dc28e3d..86e1a0d 100644 (file)
--- a/src/newsletter/models.py
+++ b/src/newsletter/models.py
@@ -4,7 +4,7 @@
 import hashlib
 
 from django.db import models
 import hashlib
 
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from django.conf import settings
 
 
 from django.conf import settings
 
 

diff --git a/src/newsletter/views.py b/src/newsletter/views.py
index 3440a47..fcb9d3c 100644 (file)
--- a/src/newsletter/views.py
+++ b/src/newsletter/views.py
@@ -4,7 +4,7 @@
 from django.http.response import HttpResponseRedirect
 from django.shortcuts import render, get_object_or_404
 from django.urls import reverse
 from django.http.response import HttpResponseRedirect
 from django.shortcuts import render, get_object_or_404
 from django.urls import reverse

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 from newsletter.forms import SubscribeForm, Newsletter
 
 
 from newsletter.forms import SubscribeForm, Newsletter
 

diff --git a/src/newtagging/models.py b/src/newtagging/models.py
index e3e8f3c..84149cc 100644 (file)
--- a/src/newtagging/models.py
+++ b/src/newtagging/models.py
@@ -12,7 +12,7 @@ from django.dispatch import Signal
 
 qn = connection.ops.quote_name
 
 
 qn = connection.ops.quote_name
 

-tags_updated = Signal(providing_args=["affected_tags"])
+tags_updated = Signal()

 
 
 def get_queryset_and_model(queryset_or_model):
 
 
 def get_queryset_and_model(queryset_or_model):

diff --git a/src/paypal/forms.py b/src/paypal/forms.py
index f35219a..cadea3f 100644 (file)
--- a/src/paypal/forms.py
+++ b/src/paypal/forms.py
@@ -2,7 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 
 class PaypalSubscriptionForm(forms.Form):
 
 
 class PaypalSubscriptionForm(forms.Form):

diff --git a/src/pdcounter/models.py b/src/pdcounter/models.py
index 40bf3e6..3ce7f72 100644 (file)
--- a/src/pdcounter/models.py
+++ b/src/pdcounter/models.py
@@ -4,7 +4,7 @@
 from django.conf import settings
 from django.db import models
 from django.urls import reverse
 from django.conf import settings
 from django.db import models
 from django.urls import reverse

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from datetime import datetime
 from django.db.models.signals import post_save, post_delete
 
 from datetime import datetime
 from django.db.models.signals import post_save, post_delete
 

diff --git a/src/picture/forms.py b/src/picture/forms.py
index 47156e8..0c03041 100644 (file)
--- a/src/picture/forms.py
+++ b/src/picture/forms.py
@@ -2,7 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from picture.models import Picture
 
 
 from picture.models import Picture
 
 

diff --git a/src/picture/models.py b/src/picture/models.py
index 7ccd97c..5f5fe4c 100644 (file)
--- a/src/picture/models.py
+++ b/src/picture/models.py
@@ -22,7 +22,7 @@ import re
 
 from PIL import Image
 
 
 from PIL import Image
 

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from newtagging import managers
 from os import path
 
 from newtagging import managers
 from os import path
 

diff --git a/src/picture/views.py b/src/picture/views.py
index e40e0ab..27f9050 100644 (file)
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -81,7 +81,7 @@ def import_picture(request):
     """docstring for import_book"""
     from django.http import HttpResponse
     from picture.forms import PictureImportForm
     """docstring for import_book"""
     from django.http import HttpResponse
     from picture.forms import PictureImportForm

-    from django.utils.translation import ugettext as _
+    from django.utils.translation import gettext as _

 
     import_form = PictureImportForm(request.POST, request.FILES)
     if import_form.is_valid():
 
     import_form = PictureImportForm(request.POST, request.FILES)
     if import_form.is_valid():

diff --git a/src/polls/models.py b/src/polls/models.py
index 2785f35..ddf4003 100644 (file)
--- a/src/polls/models.py
+++ b/src/polls/models.py
@@ -2,7 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.db import models
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from django.core.exceptions import ValidationError
 from django.urls import reverse
 
 from django.core.exceptions import ValidationError
 from django.urls import reverse
 

diff --git a/src/push/models.py b/src/push/models.py
index b149ed7..54fd1a0 100644 (file)
--- a/src/push/models.py
+++ b/src/push/models.py
@@ -2,7 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.db import models
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 
 class Notification(models.Model):
 
 
 class Notification(models.Model):

diff --git a/src/pz/bank.py b/src/pz/bank.py
index de22ac0..d5eef93 100644 (file)
--- a/src/pz/bank.py
+++ b/src/pz/bank.py
@@ -4,7 +4,7 @@ from io import StringIO
 from django.conf import settings
 from django.http import HttpResponse
 from django.utils.safestring import mark_safe
 from django.conf import settings
 from django.http import HttpResponse
 from django.utils.safestring import mark_safe

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 
 def bank_export(modeladmin, request, queryset):
 
 
 def bank_export(modeladmin, request, queryset):

diff --git a/src/pz/migrations/0012_auto_20221006_1431.py b/src/pz/migrations/0012_auto_20221006_1431.py
new file mode 100644 (file)
index 0000000..b217376
--- /dev/null
+++ b/src/pz/migrations/0012_auto_20221006_1431.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.14 on 2022-10-06 12:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pz', '0011_payment'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='directdebit',
+            name='iban_valid',
+            field=models.BooleanField(default=False, null=True, verbose_name='IBAN valid'),
+        ),
+    ]

diff --git a/src/pz/models.py b/src/pz/models.py
index c466084..4bd3673 100644 (file)
--- a/src/pz/models.py
+++ b/src/pz/models.py
@@ -1,7 +1,7 @@
 import re
 from django.db import models
 from django.utils.timezone import now
 import re
 from django.db import models
 from django.utils.timezone import now

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from .bank import parse_export_feedback, parse_payment_feedback
 
 
 from .bank import parse_export_feedback, parse_payment_feedback
 
 


@@ -44,7 +44,7 @@ class DirectDebit(models.Model):
     phone = models.CharField(_('phone'), max_length=255, blank=True)
     email = models.CharField(_('e-mail'), max_length=255, blank=True)
     iban = models.CharField(_('IBAN'), max_length=255, blank=True)
     phone = models.CharField(_('phone'), max_length=255, blank=True)
     email = models.CharField(_('e-mail'), max_length=255, blank=True)
     iban = models.CharField(_('IBAN'), max_length=255, blank=True)

-    iban_valid = models.NullBooleanField(_('IBAN valid'), default=False)
+    iban_valid = models.BooleanField(_('IBAN valid'), default=False, null=True)

     is_consumer = models.BooleanField(_('is a consumer'), default=True)
     payment_id = models.CharField(_('payment identifier'), max_length=255, blank=True, unique=True)
     agree_fundraising = models.BooleanField(_('agree fundraising'), default=False)
     is_consumer = models.BooleanField(_('is a consumer'), default=True)
     payment_id = models.CharField(_('payment identifier'), max_length=255, blank=True, unique=True)
     agree_fundraising = models.BooleanField(_('agree fundraising'), default=False)

diff --git a/src/search/forms.py b/src/search/forms.py
index 34af136..4fa051d 100644 (file)
--- a/src/search/forms.py
+++ b/src/search/forms.py
@@ -2,7 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 from search.fields import JQueryAutoCompleteSearchField
 
 
 from search.fields import JQueryAutoCompleteSearchField
 

diff --git a/src/social/admin.py b/src/social/admin.py
index 91ebcdb..22cc3e3 100644 (file)
--- a/src/social/admin.py
+++ b/src/social/admin.py
@@ -4,7 +4,7 @@
 from django.contrib import admin
 from django.forms import ModelForm
 from django.forms.widgets import TextInput
 from django.contrib import admin
 from django.forms import ModelForm
 from django.forms.widgets import TextInput

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from admin_ordering.admin import OrderableAdmin
 from social.models import Cite, BannerGroup, Carousel, CarouselItem
 
 from admin_ordering.admin import OrderableAdmin
 from social.models import Cite, BannerGroup, Carousel, CarouselItem
 

diff --git a/src/social/forms.py b/src/social/forms.py
index 5c0973c..1e2462a 100644 (file)
--- a/src/social/forms.py
+++ b/src/social/forms.py
@@ -2,7 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 from catalogue.models import Tag
 from catalogue import utils
 
 from catalogue.models import Tag
 from catalogue import utils

diff --git a/src/social/models.py b/src/social/models.py
index 4c8cd74..b254b22 100644 (file)
--- a/src/social/models.py
+++ b/src/social/models.py
@@ -6,7 +6,7 @@ from django.db import models
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.urls import reverse
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.urls import reverse

-from django.utils.translation import ugettext_lazy as _, get_language
+from django.utils.translation import gettext_lazy as _, get_language

 from catalogue.models import Book
 from wolnelektury.utils import cached_render, clear_cached_renders
 
 from catalogue.models import Book
 from wolnelektury.utils import cached_render, clear_cached_renders
 

diff --git a/src/sponsors/models.py b/src/sponsors/models.py
index 9056313..704b066 100644 (file)
--- a/src/sponsors/models.py
+++ b/src/sponsors/models.py
@@ -6,7 +6,7 @@ import time
 from io import BytesIO
 from django.core.cache import cache
 from django.db import models
 from io import BytesIO
 from django.core.cache import cache
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from django.template.loader import render_to_string
 from PIL import Image
 
 from django.template.loader import render_to_string
 from PIL import Image
 

diff --git a/src/suggest/forms.py b/src/suggest/forms.py
index b276f03..1fdfc60 100644 (file)
--- a/src/suggest/forms.py
+++ b/src/suggest/forms.py
@@ -7,8 +7,8 @@ from django.core.exceptions import ValidationError
 from django.core.mail import send_mail, mail_managers
 from django.core.validators import validate_email
 from django.urls import reverse
 from django.core.mail import send_mail, mail_managers
 from django.core.validators import validate_email
 from django.urls import reverse

-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ugettext
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext

 
 from newsletter.forms import NewsletterForm
 from suggest.models import PublishingSuggestion, Suggestion
 
 from newsletter.forms import NewsletterForm
 from suggest.models import PublishingSuggestion, Suggestion


@@ -55,8 +55,8 @@ Kontakt: %(contact)s
             pass
         else:
             send_noreply_mail(
             pass
         else:
             send_noreply_mail(

-                ugettext('Thank you for your suggestion.'),
-                ugettext("""\
+                gettext('Thank you for your suggestion.'),
+                gettext("""\

 Thank you for your comment on WolneLektury.pl.
 The suggestion has been referred to the project coordinator."""),
                 [contact], fail_silently=True)
 Thank you for your comment on WolneLektury.pl.
 The suggestion has been referred to the project coordinator."""),
                 [contact], fail_silently=True)


@@ -73,7 +73,7 @@ class PublishingSuggestForm(NewsletterForm):
 
     def clean(self):
         if not self.cleaned_data['ebook'] and not self.cleaned_data['audiobook']:
 
     def clean(self):
         if not self.cleaned_data['ebook'] and not self.cleaned_data['audiobook']:

-            msg = ugettext("One of these options is required.")
+            msg = gettext("One of these options is required.")

             self._errors['ebook'] = self.error_class([msg])
             self._errors['audiobook'] = self.error_class([msg])
         return super(PublishingSuggestForm, self).clean()
             self._errors['ebook'] = self.error_class([msg])
             self._errors['audiobook'] = self.error_class([msg])
         return super(PublishingSuggestForm, self).clean()


@@ -119,8 +119,8 @@ class PublishingSuggestForm(NewsletterForm):
                 pass
             else:
                 send_noreply_mail(
                 pass
             else:
                 send_noreply_mail(

-                    ugettext('Thank you for your suggestion.'),
-                    ugettext("""\
+                    gettext('Thank you for your suggestion.'),
+                    gettext("""\

 Thank you for your comment on WolneLektury.pl.
 The suggestion has been referred to the project coordinator."""),
                     [contact], fail_silently=True)
 Thank you for your comment on WolneLektury.pl.
 The suggestion has been referred to the project coordinator."""),
                     [contact], fail_silently=True)

diff --git a/src/suggest/models.py b/src/suggest/models.py
index a5742d8..1e5f2b0 100644 (file)
--- a/src/suggest/models.py
+++ b/src/suggest/models.py
@@ -6,7 +6,7 @@ from datetime import timedelta
 
 from django.db import models
 from django.contrib.auth.models import User
 
 from django.db import models
 from django.contrib.auth.models import User

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 
 class Suggestion(models.Model):
 
 
 class Suggestion(models.Model):

diff --git a/src/suggest/views.py b/src/suggest/views.py
index 060ac59..96e121e 100644 (file)
--- a/src/suggest/views.py
+++ b/src/suggest/views.py
@@ -2,7 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.urls import reverse_lazy
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.urls import reverse_lazy

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 from ajaxable.utils import AjaxableFormView
 from suggest import forms
 
 from ajaxable.utils import AjaxableFormView
 from suggest import forms

diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py
index c640d31..133db91 100644 (file)
--- a/src/wolnelektury/settings/basic.py
+++ b/src/wolnelektury/settings/basic.py
@@ -25,6 +25,8 @@ DATABASES = {
     }
 }
 
     }
 }
 

+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+

 SOLR_TEST = "http://localhost:8983/solr/wl_test/"
 SOLR_STOPWORDS = "/path/to/solr/data/conf/lang/stopwords_pl.txt"
 
 SOLR_TEST = "http://localhost:8983/solr/wl_test/"
 SOLR_STOPWORDS = "/path/to/solr/data/conf/lang/stopwords_pl.txt"
 

diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py
index 5e56f59..61c55c4 100644 (file)
--- a/src/wolnelektury/views.py
+++ b/src/wolnelektury/views.py
@@ -13,7 +13,7 @@ from django.core.cache import cache
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
 from django.utils.http import urlquote_plus
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
 from django.utils.http import urlquote_plus

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView