-i https://py.mdrn.pl/simple/
# django
-Django==2.2.28
+Django==3.2.16
fnpdjango==0.6
docutils==0.16
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
-# 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
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
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.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.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
PLACE_DEFINITIONS = [
('top', _('Top of all pages.'), True),
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
# 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/': {
# 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 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
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 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
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
# 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):
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
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()
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 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
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
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):
# 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):
#
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 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.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
# 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 = {
# 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 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
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():
- 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):
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 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):
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 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
#\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
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 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 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:
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.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
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.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
qn = connection.ops.quote_name
-tags_updated = Signal(providing_args=["affected_tags"])
+tags_updated = Signal()
def get_queryset_and_model(queryset_or_model):
# 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):
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
# 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 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
"""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():
# 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
# 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):
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):
--- /dev/null
+# 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'),
+ ),
+ ]
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
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)
# 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 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
# 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 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 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.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
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)
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()
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)
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):
# 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
}
}
+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"
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
fnp / wolnelektury.git / commitdiff