From c7c62c5e39afd56a856588a131efcc392630edeb Mon Sep 17 00:00:00 2001 From: Yoan Le Clanche Date: Thu, 16 Dec 2021 17:59:20 +0100 Subject: [PATCH] Convert to Django 3.2 --- teleforma/fields.py | 2 +- teleforma/forms.py | 2 +- teleforma/models/ae.py | 2 +- teleforma/models/core.py | 2 +- teleforma/models/crfpa.py | 2 +- teleforma/models/pro.py | 2 +- teleforma/models/profile.py | 4 ++-- teleforma/templatetags/teleforma_tags.py | 6 +++--- teleforma/views/core.py | 4 ++-- teleforma/views/pro.py | 2 +- teleforma/views/profile.py | 8 ++++---- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/teleforma/fields.py b/teleforma/fields.py index 06bc6921..eacf6813 100644 --- a/teleforma/fields.py +++ b/teleforma/fields.py @@ -6,7 +6,7 @@ from django.core.exceptions import ValidationError from django.core import exceptions from django import forms import datetime -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ import re try: diff --git a/teleforma/forms.py b/teleforma/forms.py index cf53b531..6936c714 100644 --- a/teleforma/forms.py +++ b/teleforma/forms.py @@ -2,7 +2,7 @@ from django.forms import ModelForm, HiddenInput from teleforma.models import * from django.forms import ModelForm -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from teleforma.models.profile import UserProfile diff --git a/teleforma/models/ae.py b/teleforma/models/ae.py index 02405678..c824c067 100644 --- a/teleforma/models/ae.py +++ b/teleforma/models/ae.py @@ -35,7 +35,7 @@ """ import django.db.models as models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from teleforma.models.core import * diff --git a/teleforma/models/core.py b/teleforma/models/core.py index a70118de..84d29d77 100755 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -45,7 +45,7 @@ from django.conf import settings from django.db.models import * from teleforma.fields import * import django.db.models as models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.utils.functional import cached_property from django.contrib.auth.models import User from django.core.exceptions import ValidationError diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py index 1c9f1175..41d823f4 100644 --- a/teleforma/models/crfpa.py +++ b/teleforma/models/crfpa.py @@ -35,7 +35,7 @@ """ import django.db.models as models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from teleforma.models.core import * diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py index 6e68ee72..0d647cb9 100644 --- a/teleforma/models/pro.py +++ b/teleforma/models/pro.py @@ -37,7 +37,7 @@ import os from django.conf import settings import django.db.models as models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from teleforma.models.core import * from forms_builder.forms.models import Form from mezzanine.core.managers import DisplayableManager diff --git a/teleforma/models/profile.py b/teleforma/models/profile.py index 501e4d09..48b7b8df 100644 --- a/teleforma/models/profile.py +++ b/teleforma/models/profile.py @@ -1,12 +1,12 @@ from django.db import models from django.contrib.auth.models import User from teleforma.models.core import MetaCore -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class UserProfile(models.Model): "User profile extension" - user = models.ForeignKey(User, unique=True, related_name="profile") + user = models.ForeignKey(User, on_delete=models.CASCADE, unique=True, related_name="profile") institution = models.CharField(_('Institution')) department = models.CharField(_('Department')) attachment = models.CharField(_('Attachment')) diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py index 978c642a..eef23a3b 100644 --- a/teleforma/templatetags/teleforma_tags.py +++ b/teleforma/templatetags/teleforma_tags.py @@ -33,13 +33,13 @@ # Authors: Guillaume Pellerin from django import template -from django.utils.http import urlquote +from urllib.parse import quote from teleforma.models import * from django.core.urlresolvers import reverse from django.utils import html from django import template from django.utils.text import capfirst -from django.utils.translation import ungettext +from django.utils.translation import ngettext from docutils.core import publish_parts from django.utils.encoding import smart_str, force_unicode from django.utils.safestring import mark_safe @@ -50,7 +50,7 @@ import datetime from django.conf import settings from django.template.defaultfilters import stringfilter import django.utils.timezone as timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from urllib.parse import urlparse from docutils.core import publish_parts from django.utils.encoding import smart_str, force_unicode diff --git a/teleforma/views/core.py b/teleforma/views/core.py index 45ab8845..229032f8 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -61,8 +61,8 @@ from django.contrib.auth.decorators import login_required, permission_required from django.core.context_processors import csrf from django.forms.models import modelformset_factory, inlineformset_factory from django.contrib.auth.models import User -from django.utils.translation import ugettext -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext +from django.utils.translation import gettext_lazy as _ from django.contrib.auth.forms import UserChangeForm from django.core.exceptions import ObjectDoesNotExist from django.contrib.syndication.views import Feed diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index f011e7bd..36c7024d 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -37,7 +37,7 @@ from teleforma.views.core import * from teleforma.context_processors import * from django.core.exceptions import PermissionDenied -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.template import loader, Context, RequestContext from django.views.generic.base import TemplateResponseMixin from django.http import HttpResponse diff --git a/teleforma/views/profile.py b/teleforma/views/profile.py index 0f428524..e0fb0d09 100644 --- a/teleforma/views/profile.py +++ b/teleforma/views/profile.py @@ -42,7 +42,7 @@ from django.utils.decorators import method_decorator from django.contrib.auth.decorators import login_required from teleforma.models.profile import UserProfile from teleforma.forms import UserProfileForm -from django.utils.translation import ugettext +from django.utils.translation import gettext class ProfileView(object): """Provide Collections web UI methods""" @@ -68,9 +68,9 @@ class ProfileView(object): user = User.objects.get(username=username) if user != request.user and not request.user.is_staff: - mess = ugettext('Access not allowed') - title = ugettext('User profile') + ' : ' + username + ' : ' + mess - description = ugettext('Please login or contact the website administator to get a private access.') + mess = gettext('Access not allowed') + title = gettext('User profile') + ' : ' + username + ' : ' + mess + description = gettext('Please login or contact the website administator to get a private access.') messages.error(request, title) return render(request, 'teleforma/messages.html', {'description' : description}) -- 2.39.5