From ee871ebc33658f9a669a35268ee9eb6ed0c781ba Mon Sep 17 00:00:00 2001 From: Agate Berriot Date: Wed, 31 Aug 2022 09:35:28 +0200 Subject: [PATCH] django4: replaced ugettext* calls with corresponding gettext* calls (#68573) --- welco/contacts/forms.py | 2 +- welco/forms.py | 2 +- welco/kb/models.py | 2 +- welco/qualif/models.py | 2 +- welco/settings.py | 2 +- welco/sources/counter/models.py | 2 +- welco/sources/mail/forms.py | 2 +- welco/sources/mail/models.py | 2 +- welco/sources/mail/views.py | 2 +- welco/sources/phone/models.py | 2 +- welco/views.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/welco/contacts/forms.py b/welco/contacts/forms.py index 2aa1976..2230109 100644 --- a/welco/contacts/forms.py +++ b/welco/contacts/forms.py @@ -15,8 +15,8 @@ # along with this program. If not, see . from django import forms +from django.utils.translation import gettext_lazy as _ from django.utils.translation import pgettext_lazy -from django.utils.translation import ugettext_lazy as _ DEFAULT_TITLE_CHOICES = ( ('', ''), diff --git a/welco/forms.py b/welco/forms.py index b0cac84..99487b7 100644 --- a/welco/forms.py +++ b/welco/forms.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .utils import get_wcs_options diff --git a/welco/kb/models.py b/welco/kb/models.py index bd6370f..f098c96 100644 --- a/welco/kb/models.py +++ b/welco/kb/models.py @@ -17,7 +17,7 @@ from ckeditor.fields import RichTextField 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 taggit.managers import TaggableManager diff --git a/welco/qualif/models.py b/welco/qualif/models.py index 0da32c4..b744de9 100644 --- a/welco/qualif/models.py +++ b/welco/qualif/models.py @@ -18,7 +18,7 @@ from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.models import ContentType 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 welco.utils import get_wcs_formdef_details, get_wcs_services, push_wcs_formdata diff --git a/welco/settings.py b/welco/settings.py index 83451ae..9d8721f 100644 --- a/welco/settings.py +++ b/welco/settings.py @@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/1.7/ref/settings/ import os from django.conf import global_settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(__file__)) diff --git a/welco/sources/counter/models.py b/welco/sources/counter/models.py index 5048d1e..b3ea19f 100644 --- a/welco/sources/counter/models.py +++ b/welco/sources/counter/models.py @@ -16,7 +16,7 @@ from django.contrib.contenttypes.fields import GenericRelation from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from welco.qualif.models import Association diff --git a/welco/sources/mail/forms.py b/welco/sources/mail/forms.py index 351496a..62d3f1c 100644 --- a/welco/sources/mail/forms.py +++ b/welco/sources/mail/forms.py @@ -16,7 +16,7 @@ from django import forms from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class MailQualificationForm(forms.Form): diff --git a/welco/sources/mail/models.py b/welco/sources/mail/models.py index ea185e0..0dad414 100644 --- a/welco/sources/mail/models.py +++ b/welco/sources/mail/models.py @@ -25,7 +25,7 @@ from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from welco.qualif.models import Association from welco.utils import get_wcs_data diff --git a/welco/sources/mail/views.py b/welco/sources/mail/views.py index bccd171..73aaeed 100644 --- a/welco/sources/mail/views.py +++ b/welco/sources/mail/views.py @@ -25,7 +25,7 @@ from django.db.transaction import atomic from django.http import HttpResponse, HttpResponseRedirect from django.template import RequestContext from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.decorators.csrf import csrf_exempt from django.views.generic import TemplateView from rest_framework import authentication, permissions, serializers, status diff --git a/welco/sources/phone/models.py b/welco/sources/phone/models.py index c3f0c67..4174050 100644 --- a/welco/sources/phone/models.py +++ b/welco/sources/phone/models.py @@ -21,7 +21,7 @@ from django.contrib.contenttypes.fields import GenericRelation from django.db import models from django.urls import reverse from django.utils.timezone import now, timedelta -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from welco.qualif.models import Association diff --git a/welco/views.py b/welco/views.py index 235fc77..4dca18e 100644 --- a/welco/views.py +++ b/welco/views.py @@ -29,7 +29,7 @@ from django.template import RequestContext from django.urls import reverse from django.utils.encoding import force_str from django.utils.http import quote -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.decorators.csrf import csrf_exempt from django.views.generic import TemplateView