From a4912ac0b99f0f6a45ddfa216eb5043504e088a1 Mon Sep 17 00:00:00 2001 From: Situphen Date: Wed, 23 Dec 2020 12:47:27 +0100 Subject: [PATCH] Renomme les fonctions `ugettext()` en `gettext()` --- zds/featured/forms.py | 2 +- zds/featured/models.py | 2 +- zds/featured/tests.py | 2 +- zds/featured/views.py | 2 +- zds/forum/commons.py | 2 +- zds/forum/forms.py | 2 +- zds/forum/views.py | 2 +- zds/gallery/api/serializers.py | 2 +- zds/gallery/api/views.py | 2 +- zds/gallery/auto_upload_gallery.py | 2 +- zds/gallery/forms.py | 2 +- zds/gallery/models.py | 2 +- zds/gallery/views.py | 2 +- zds/member/__init__.py | 2 +- zds/member/api/views.py | 2 +- zds/member/commons.py | 10 +++++----- zds/member/forms.py | 2 +- zds/member/models.py | 2 +- zds/member/tests/tests_views.py | 2 +- zds/member/utils.py | 2 +- zds/member/validators.py | 2 +- zds/member/views.py | 4 ++-- zds/mp/forms.py | 2 +- zds/mp/validators.py | 2 +- zds/mp/views.py | 2 +- zds/notification/models.py | 2 +- zds/notification/views.py | 2 +- zds/pages/models.py | 2 +- zds/pages/tests.py | 2 +- zds/pages/views.py | 2 +- zds/search/constant.py | 2 +- zds/searchv2/forms.py | 2 +- zds/searchv2/views.py | 2 +- zds/tutorialv2/feeds.py | 2 +- zds/tutorialv2/forms.py | 2 +- zds/tutorialv2/management/commands/generate_epub.py | 2 +- .../management/commands/generate_markdown.py | 2 +- zds/tutorialv2/management/commands/generate_pdf.py | 2 +- zds/tutorialv2/managers.py | 2 +- zds/tutorialv2/mixins.py | 2 +- zds/tutorialv2/models/__init__.py | 2 +- zds/tutorialv2/models/database.py | 2 +- zds/tutorialv2/models/mixins.py | 2 +- zds/tutorialv2/models/versioned.py | 2 +- zds/tutorialv2/publication_utils.py | 2 +- zds/tutorialv2/publish_container.py | 2 +- zds/tutorialv2/receivers.py | 2 +- zds/tutorialv2/tests/tests_opinion_views.py | 2 +- zds/tutorialv2/tests/tests_views/tests_content.py | 2 +- zds/tutorialv2/tests/tests_views/tests_published.py | 2 +- zds/tutorialv2/utils.py | 2 +- zds/tutorialv2/views/alerts.py | 2 +- zds/tutorialv2/views/archives.py | 2 +- zds/tutorialv2/views/authors.py | 2 +- zds/tutorialv2/views/beta.py | 2 +- zds/tutorialv2/views/comments.py | 2 +- zds/tutorialv2/views/containers_extracts.py | 2 +- zds/tutorialv2/views/contents.py | 2 +- zds/tutorialv2/views/contributors.py | 2 +- zds/tutorialv2/views/display.py | 2 +- zds/tutorialv2/views/editorialization.py | 2 +- zds/tutorialv2/views/help.py | 2 +- zds/tutorialv2/views/lists.py | 2 +- zds/tutorialv2/views/misc.py | 2 +- zds/tutorialv2/views/statistics.py | 2 +- zds/tutorialv2/views/validations_contents.py | 2 +- zds/tutorialv2/views/validations_opinions.py | 2 +- zds/utils/forms.py | 2 +- zds/utils/header_notifications.py | 2 +- zds/utils/mixins.py | 2 +- zds/utils/models.py | 2 +- zds/utils/templatetags/date.py | 2 +- zds/utils/templatetags/emarkdown.py | 2 +- zds/utils/templatetags/feminize.py | 2 +- zds/utils/templatetags/htmldiff.py | 2 +- zds/utils/templatetags/interventions.py | 2 +- zds/utils/templatetags/joinby.py | 2 +- zds/utils/templatetags/minute_to_duration.py | 2 +- 78 files changed, 83 insertions(+), 83 deletions(-) diff --git a/zds/featured/forms.py b/zds/featured/forms.py index a1d1a13029..e12819b8a2 100644 --- a/zds/featured/forms.py +++ b/zds/featured/forms.py @@ -3,7 +3,7 @@ from crispy_forms.layout import Layout, Field, ButtonHolder from django import forms from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.featured.models import FeaturedResource, FeaturedMessage diff --git a/zds/featured/models.py b/zds/featured/models.py index a6575ef9c5..287a5079a5 100644 --- a/zds/featured/models.py +++ b/zds/featured/models.py @@ -1,7 +1,7 @@ from django.db import models from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.fields import GenericForeignKey -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.featured.managers import FeaturedResourceManager, FeaturedMessageManager, FeaturedRequestedManager from zds.member.models import User diff --git a/zds/featured/tests.py b/zds/featured/tests.py index 1c0db08fbb..6076250696 100644 --- a/zds/featured/tests.py +++ b/zds/featured/tests.py @@ -2,7 +2,7 @@ from django.contrib.contenttypes.models import ContentType from django.urls import reverse from django.test import TestCase -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from zds.member.factories import StaffProfileFactory, ProfileFactory from zds.featured.factories import FeaturedResourceFactory diff --git a/zds/featured/views.py b/zds/featured/views.py index 01e0090805..07973fc2ad 100644 --- a/zds/featured/views.py +++ b/zds/featured/views.py @@ -5,7 +5,7 @@ from django.urls import reverse from django.shortcuts import redirect from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.views.generic import CreateView, RedirectView, UpdateView, FormView, DeleteView from django.views.generic.list import MultipleObjectMixin from django.http import HttpResponse diff --git a/zds/forum/commons.py b/zds/forum/commons.py index cb29dcda48..eea9352002 100644 --- a/zds/forum/commons.py +++ b/zds/forum/commons.py @@ -5,7 +5,7 @@ from django.core.exceptions import PermissionDenied from django.http import Http404 from django.shortcuts import get_object_or_404 -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.views.generic.detail import SingleObjectMixin from django.contrib.auth.decorators import permission_required from django.contrib.auth.models import User diff --git a/zds/forum/forms.py b/zds/forum/forms.py index 4cac77359b..36ed4357d5 100644 --- a/zds/forum/forms.py +++ b/zds/forum/forms.py @@ -1,7 +1,7 @@ from django import forms from django.conf import settings from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from crispy_forms.helper import FormHelper from crispy_forms.layout import Layout, Field, Hidden, HTML diff --git a/zds/forum/views.py b/zds/forum/views.py index de83d9dd4d..9bf40a1423 100644 --- a/zds/forum/views.py +++ b/zds/forum/views.py @@ -12,7 +12,7 @@ from django.shortcuts import redirect, get_object_or_404, render from django.template.loader import render_to_string from django.utils.decorators import method_decorator -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.decorators.http import require_POST, require_GET from django.views.generic import ListView, DetailView, CreateView, UpdateView from django.views.generic.detail import SingleObjectMixin diff --git a/zds/gallery/api/serializers.py b/zds/gallery/api/serializers.py index f6aee41c78..c28d834c9a 100644 --- a/zds/gallery/api/serializers.py +++ b/zds/gallery/api/serializers.py @@ -2,7 +2,7 @@ from dry_rest_permissions.generics import DRYPermissionsField from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.api.serializers import ZdSModelSerializer from zds.gallery.models import Gallery, Image, UserGallery diff --git a/zds/gallery/api/views.py b/zds/gallery/api/views.py index e29ccfec68..732da9a135 100644 --- a/zds/gallery/api/views.py +++ b/zds/gallery/api/views.py @@ -6,7 +6,7 @@ from rest_framework_extensions.key_constructor import bits from dry_rest_permissions.generics import DRYPermissions -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.api.bits import UpdatedAtKeyBit from zds.api.key_constructor import PagingListKeyConstructor, DetailKeyConstructor diff --git a/zds/gallery/auto_upload_gallery.py b/zds/gallery/auto_upload_gallery.py index 2090062017..884fceec5a 100644 --- a/zds/gallery/auto_upload_gallery.py +++ b/zds/gallery/auto_upload_gallery.py @@ -1,5 +1,5 @@ from django.http.request import HttpRequest -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from zds.gallery.models import Gallery, UserGallery, GALLERY_WRITE from zds.tutorialv2.models.database import PublishableContent diff --git a/zds/gallery/forms.py b/zds/gallery/forms.py index 9c6e99947e..6db64ef4a1 100644 --- a/zds/gallery/forms.py +++ b/zds/gallery/forms.py @@ -1,5 +1,5 @@ from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from crispy_forms.bootstrap import StrictButton from crispy_forms.helper import FormHelper diff --git a/zds/gallery/models.py b/zds/gallery/models.py index 4954ece949..8e804467b6 100644 --- a/zds/gallery/models.py +++ b/zds/gallery/models.py @@ -12,7 +12,7 @@ from django.contrib.auth.models import User from django.db import models from django.dispatch import receiver -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.gallery.managers import GalleryManager diff --git a/zds/gallery/views.py b/zds/gallery/views.py index a598085ccb..9c8eb92a60 100644 --- a/zds/gallery/views.py +++ b/zds/gallery/views.py @@ -6,7 +6,7 @@ from django.http import Http404, HttpResponseRedirect from django.views.generic import DeleteView, FormView, View from django.shortcuts import redirect, get_object_or_404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.auth.mixins import LoginRequiredMixin from zds.gallery.forms import ( diff --git a/zds/member/__init__.py b/zds/member/__init__.py index ac79c86df7..caa2fbc910 100644 --- a/zds/member/__init__.py +++ b/zds/member/__init__.py @@ -1,4 +1,4 @@ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ NEW_PROVIDER_USES = [("NEW_ACCOUNT", _("Nouveau compte")), ("EMAIL_EDIT", _("Édition de l'adresse e-mail"))] diff --git a/zds/member/api/views.py b/zds/member/api/views.py index e7af271b85..e0b0ee5b98 100644 --- a/zds/member/api/views.py +++ b/zds/member/api/views.py @@ -1,7 +1,7 @@ import datetime import logging -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.core.cache import cache from django.db.models.signals import post_save, post_delete from dry_rest_permissions.generics import DRYPermissions diff --git a/zds/member/commons.py b/zds/member/commons.py index 39ffe6275e..23d73aead2 100644 --- a/zds/member/commons.py +++ b/zds/member/commons.py @@ -7,7 +7,7 @@ from django.shortcuts import get_object_or_404 from django.template.loader import render_to_string from django.template.defaultfilters import pluralize -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.member.models import Profile, TokenRegister, Ban from zds.utils.models import get_hat_from_settings @@ -108,7 +108,7 @@ def get_type(self): Gets the type of a sanction. :return: type of the sanction. - :rtype: ugettext_lazy + :rtype: gettext_lazy """ raise NotImplementedError("`get_type()` must be implemented.") @@ -126,7 +126,7 @@ def get_detail(self): Gets detail of a sanction. :return: detail of the sanction. - :rtype: ugettext_lazy + :rtype: gettext_lazy """ raise NotImplementedError("`get_detail()` must be implemented.") @@ -168,7 +168,7 @@ def get_message_unsanction(self): Gets the message for an un-sanction. :return: message of the un-sanction. - :rtype: ugettext_lazy + :rtype: gettext_lazy """ return _( "Bonjour **{0}**,\n\n" @@ -184,7 +184,7 @@ def get_message_sanction(self): Gets the message for a sanction. :return: message of the sanction. - :rtype: ugettext_lazy + :rtype: gettext_lazy """ return _( "Bonjour **{0}**,\n\n" diff --git a/zds/member/forms.py b/zds/member/forms.py index 766028f0f3..1e875d9f78 100644 --- a/zds/member/forms.py +++ b/zds/member/forms.py @@ -3,7 +3,7 @@ from django.contrib.auth import authenticate from django.contrib.auth.models import User, Group from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from captcha.fields import ReCaptchaField from crispy_forms.bootstrap import StrictButton diff --git a/zds/member/models.py b/zds/member/models.py index e0c13cdf74..668b815d6c 100644 --- a/zds/member/models.py +++ b/zds/member/models.py @@ -8,7 +8,7 @@ from django.urls import reverse from django.db import models from django.dispatch import receiver -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.forum.models import Post, Topic from zds.notification.models import TopicAnswerSubscription diff --git a/zds/member/tests/tests_views.py b/zds/member/tests/tests_views.py index 026228dff7..0d48335ac2 100644 --- a/zds/member/tests/tests_views.py +++ b/zds/member/tests/tests_views.py @@ -12,7 +12,7 @@ from django.urls import reverse from django.test import TestCase, override_settings from django.utils.html import escape -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.notification.models import TopicAnswerSubscription from zds.member.factories import ( diff --git a/zds/member/utils.py b/zds/member/utils.py index 0d6108f697..f7373651b2 100644 --- a/zds/member/utils.py +++ b/zds/member/utils.py @@ -1,6 +1,6 @@ from social_django.middleware import SocialAuthExceptionMiddleware from django.contrib import messages -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.urls import reverse import logging diff --git a/zds/member/validators.py b/zds/member/validators.py index 66c896c80b..2c95ea3e1f 100644 --- a/zds/member/validators.py +++ b/zds/member/validators.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError from django.core.validators import EmailValidator from django.utils.encoding import force_str -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.utils.misc import contains_utf8mb4 from zds.member.models import BannedEmailProvider, Profile diff --git a/zds/member/views.py b/zds/member/views.py index 78478fef0e..eec5ecd014 100644 --- a/zds/member/views.py +++ b/zds/member/views.py @@ -20,8 +20,8 @@ from django.template.loader import render_to_string from django.utils.decorators import method_decorator from django.utils.text import format_lazy -from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import ugettext as __ +from django.utils.translation import gettext_lazy as _ +from django.utils.translation import gettext as __ from django.views.decorators.http import require_POST from django.views.generic import DetailView, UpdateView, CreateView, FormView, View diff --git a/zds/mp/forms.py b/zds/mp/forms.py index 981febcbd2..f214ffc362 100644 --- a/zds/mp/forms.py +++ b/zds/mp/forms.py @@ -4,7 +4,7 @@ from django import forms from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.mp.models import PrivateTopic from zds.mp.validators import ParticipantsStringValidator, TitleValidator, TextValidator diff --git a/zds/mp/validators.py b/zds/mp/validators.py index 3eede1eff4..02379c5fe1 100644 --- a/zds/mp/validators.py +++ b/zds/mp/validators.py @@ -1,6 +1,6 @@ from django.http import Http404 from django.shortcuts import get_object_or_404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.api.validators import Validator from zds.member.models import Profile diff --git a/zds/mp/views.py b/zds/mp/views.py index 81b171bda8..970fd7509d 100644 --- a/zds/mp/views.py +++ b/zds/mp/views.py @@ -9,7 +9,7 @@ from django.http import Http404, StreamingHttpResponse from django.shortcuts import redirect, get_object_or_404, render from django.utils.decorators import method_decorator -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import CreateView, RedirectView, UpdateView from django.views.generic.detail import SingleObjectMixin from django.views.generic.list import MultipleObjectMixin diff --git a/zds/notification/models.py b/zds/notification/models.py index a0ea8e8b2c..2a3fd3ca87 100644 --- a/zds/notification/models.py +++ b/zds/notification/models.py @@ -8,7 +8,7 @@ from django.core.validators import validate_email, ValidationError from django.db import models, IntegrityError, transaction from django.template.loader import render_to_string -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.conf import settings from zds.forum.models import Topic, Post diff --git a/zds/notification/views.py b/zds/notification/views.py index b29ead32ed..aaaa32bacc 100644 --- a/zds/notification/views.py +++ b/zds/notification/views.py @@ -3,7 +3,7 @@ from django.utils.decorators import method_decorator from django.contrib import messages from django.views.decorators.http import require_POST -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.shortcuts import redirect from django.urls import reverse diff --git a/zds/pages/models.py b/zds/pages/models.py index ec14ad2061..bb7ee1bdef 100644 --- a/zds/pages/models.py +++ b/zds/pages/models.py @@ -1,6 +1,6 @@ from django.contrib.auth.models import Group, User from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class GroupContact(models.Model): diff --git a/zds/pages/tests.py b/zds/pages/tests.py index 166637d75b..da64e93d91 100644 --- a/zds/pages/tests.py +++ b/zds/pages/tests.py @@ -1,7 +1,7 @@ from django.urls import reverse from django.test import TestCase from django.test.utils import override_settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.forum.models import Post from zds.forum.factories import create_category_and_forum, create_topic_in_forum diff --git a/zds/pages/views.py b/zds/pages/views.py index 4de1212244..ae099423ac 100644 --- a/zds/pages/views.py +++ b/zds/pages/views.py @@ -6,7 +6,7 @@ from django.contrib.auth.decorators import login_required, permission_required from django.shortcuts import render, get_object_or_404, redirect from django.utils.decorators import method_decorator -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import ListView, DetailView from django.core.exceptions import PermissionDenied from django.views.decorators.http import require_POST diff --git a/zds/search/constant.py b/zds/search/constant.py index bf377808f0..d4710dfb25 100644 --- a/zds/search/constant.py +++ b/zds/search/constant.py @@ -1,4 +1,4 @@ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ MODEL_TOPIC = "sujets" MODEL_POST = "messages" diff --git a/zds/searchv2/forms.py b/zds/searchv2/forms.py index 72bc653f08..f0b7c568f8 100644 --- a/zds/searchv2/forms.py +++ b/zds/searchv2/forms.py @@ -2,7 +2,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 _ from crispy_forms.bootstrap import StrictButton from crispy_forms.helper import FormHelper diff --git a/zds/searchv2/views.py b/zds/searchv2/views.py index 543434f725..f566c935c3 100644 --- a/zds/searchv2/views.py +++ b/zds/searchv2/views.py @@ -8,7 +8,7 @@ from django.core.exceptions import PermissionDenied from django.contrib import messages from django.http import HttpResponse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.shortcuts import render from django.urls import reverse from django.views.generic import CreateView diff --git a/zds/tutorialv2/feeds.py b/zds/tutorialv2/feeds.py index 22408fc9e3..b432682821 100644 --- a/zds/tutorialv2/feeds.py +++ b/zds/tutorialv2/feeds.py @@ -2,7 +2,7 @@ from django.contrib.syndication.views import Feed from django.shortcuts import get_object_or_404 from django.utils.feedgenerator import Atom1Feed -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.utils.models import Category, SubCategory from zds.tutorialv2.models.database import PublishedContent diff --git a/zds/tutorialv2/forms.py b/zds/tutorialv2/forms.py index 747e78ea7d..8c0a70e1a0 100644 --- a/zds/tutorialv2/forms.py +++ b/zds/tutorialv2/forms.py @@ -12,7 +12,7 @@ from zds.tutorialv2.models import TYPE_CHOICES from zds.utils.models import HelpWriting from zds.tutorialv2.models.database import PublishableContent, ContentContributionRole -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.member.models import Profile from zds.tutorialv2.utils import slugify_raise_on_invalid, InvalidSlugError from zds.utils.forms import TagValidator, IncludeEasyMDE diff --git a/zds/tutorialv2/management/commands/generate_epub.py b/zds/tutorialv2/management/commands/generate_epub.py index fcdcfdef62..8308a3073b 100644 --- a/zds/tutorialv2/management/commands/generate_epub.py +++ b/zds/tutorialv2/management/commands/generate_epub.py @@ -3,7 +3,7 @@ from pathlib import Path from django.core.management.base import BaseCommand -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.conf import settings from zds.tutorialv2.models.database import PublishedContent from zds.tutorialv2.models.versioned import NotAPublicVersion diff --git a/zds/tutorialv2/management/commands/generate_markdown.py b/zds/tutorialv2/management/commands/generate_markdown.py index 2467f935d0..706b8c652c 100644 --- a/zds/tutorialv2/management/commands/generate_markdown.py +++ b/zds/tutorialv2/management/commands/generate_markdown.py @@ -3,7 +3,7 @@ from django.core.management import BaseCommand from django.utils import translation -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.tutorialv2.models.database import PublishedContent from zds.tutorialv2.models.versioned import NotAPublicVersion diff --git a/zds/tutorialv2/management/commands/generate_pdf.py b/zds/tutorialv2/management/commands/generate_pdf.py index 8f3f548fc1..4cb02a64df 100644 --- a/zds/tutorialv2/management/commands/generate_pdf.py +++ b/zds/tutorialv2/management/commands/generate_pdf.py @@ -3,7 +3,7 @@ from pathlib import Path from django.core.management.base import BaseCommand -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.conf import settings from zds.tutorialv2.models.database import PublishedContent from zds.tutorialv2.models.versioned import NotAPublicVersion diff --git a/zds/tutorialv2/managers.py b/zds/tutorialv2/managers.py index 15ae38c69f..682cd8d15c 100644 --- a/zds/tutorialv2/managers.py +++ b/zds/tutorialv2/managers.py @@ -1,7 +1,7 @@ from django.conf import settings from django.db import models from django.db.models import Count, F -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.utils.models import Tag from model_utils.managers import InheritanceManager diff --git a/zds/tutorialv2/mixins.py b/zds/tutorialv2/mixins.py index d6e093b54a..1e04862f61 100644 --- a/zds/tutorialv2/mixins.py +++ b/zds/tutorialv2/mixins.py @@ -4,7 +4,7 @@ from django.http import Http404, HttpResponse, HttpResponsePermanentRedirect, StreamingHttpResponse from django.template.loader import render_to_string from django.shortcuts import redirect -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import DetailView, FormView from django.views.generic import View diff --git a/zds/tutorialv2/models/__init__.py b/zds/tutorialv2/models/__init__.py index 6e4a660218..b636226aa8 100644 --- a/zds/tutorialv2/models/__init__.py +++ b/zds/tutorialv2/models/__init__.py @@ -1,4 +1,4 @@ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ CONTENT_TYPES = ( diff --git a/zds/tutorialv2/models/database.py b/zds/tutorialv2/models/database.py index 4f43ed7e9b..a8ed68f525 100644 --- a/zds/tutorialv2/models/database.py +++ b/zds/tutorialv2/models/database.py @@ -15,7 +15,7 @@ from django.http import Http404 from django.urls import reverse from django.utils.http import urlencode -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from elasticsearch_dsl import Mapping, Q as ES_Q from elasticsearch_dsl.field import Text, Keyword, Date, Boolean from git import Repo, BadObject diff --git a/zds/tutorialv2/models/mixins.py b/zds/tutorialv2/models/mixins.py index 334d1f839a..2bb67d5d94 100644 --- a/zds/tutorialv2/models/mixins.py +++ b/zds/tutorialv2/models/mixins.py @@ -1,5 +1,5 @@ from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class TemplatableContentModelMixin: diff --git a/zds/tutorialv2/models/versioned.py b/zds/tutorialv2/models/versioned.py index 681094c988..6b1e180511 100644 --- a/zds/tutorialv2/models/versioned.py +++ b/zds/tutorialv2/models/versioned.py @@ -11,7 +11,7 @@ from django.conf import settings from django.core.exceptions import PermissionDenied from django.urls import reverse -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 zds.tutorialv2.models.mixins import TemplatableContentModelMixin diff --git a/zds/tutorialv2/publication_utils.py b/zds/tutorialv2/publication_utils.py index e752df7ec7..bec2aca54c 100644 --- a/zds/tutorialv2/publication_utils.py +++ b/zds/tutorialv2/publication_utils.py @@ -13,7 +13,7 @@ from django.core.exceptions import ObjectDoesNotExist from django.template.loader import render_to_string from django.utils import translation -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.conf import settings from zds.tutorialv2 import signals from zds.tutorialv2.epub_utils import build_ebook diff --git a/zds/tutorialv2/publish_container.py b/zds/tutorialv2/publish_container.py index edddee7c85..197c9cfee1 100644 --- a/zds/tutorialv2/publish_container.py +++ b/zds/tutorialv2/publish_container.py @@ -7,7 +7,7 @@ from pathlib import Path import copy from django.template.loader import render_to_string -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.utils.templatetags.emarkdown import emarkdown diff --git a/zds/tutorialv2/receivers.py b/zds/tutorialv2/receivers.py index 574eb01a12..94ff627e1f 100644 --- a/zds/tutorialv2/receivers.py +++ b/zds/tutorialv2/receivers.py @@ -3,7 +3,7 @@ from django.db.models.signals import post_delete from django.dispatch.dispatcher import receiver -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.tutorialv2.models.database import PublishableContent, ContentReaction from zds.tutorialv2.signals import content_unpublished diff --git a/zds/tutorialv2/tests/tests_opinion_views.py b/zds/tutorialv2/tests/tests_opinion_views.py index de7bea37a1..77bbcddf38 100644 --- a/zds/tutorialv2/tests/tests_opinion_views.py +++ b/zds/tutorialv2/tests/tests_opinion_views.py @@ -1,7 +1,7 @@ import datetime from django.urls import reverse from django.test import TestCase -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.gallery.factories import UserGalleryFactory from zds.member.factories import ProfileFactory, StaffProfileFactory diff --git a/zds/tutorialv2/tests/tests_views/tests_content.py b/zds/tutorialv2/tests/tests_views/tests_content.py index 8b5454a957..6218bbf8be 100644 --- a/zds/tutorialv2/tests/tests_views/tests_content.py +++ b/zds/tutorialv2/tests/tests_views/tests_content.py @@ -13,7 +13,7 @@ from django.core import mail from django.urls import reverse from django.test import TestCase -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.forum.factories import ForumFactory, ForumCategoryFactory from zds.forum.models import Topic, Post, TopicRead diff --git a/zds/tutorialv2/tests/tests_views/tests_published.py b/zds/tutorialv2/tests/tests_views/tests_published.py index 1d67de34e0..1d7be0ea30 100644 --- a/zds/tutorialv2/tests/tests_views/tests_published.py +++ b/zds/tutorialv2/tests/tests_views/tests_published.py @@ -6,7 +6,7 @@ from django.urls import reverse from django.test import TestCase from django.test.utils import override_settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.forum.factories import ForumFactory, ForumCategoryFactory from zds.gallery.factories import UserGalleryFactory diff --git a/zds/tutorialv2/utils.py b/zds/tutorialv2/utils.py index 362d100eea..a9462dffc8 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -4,7 +4,7 @@ from urllib.parse import urlsplit, urlunsplit, quote from django.contrib.auth.models import User from django.http import Http404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from git import Repo, Actor from django.conf import settings diff --git a/zds/tutorialv2/views/alerts.py b/zds/tutorialv2/views/alerts.py index 543f435d3a..deff9e68cb 100644 --- a/zds/tutorialv2/views/alerts.py +++ b/zds/tutorialv2/views/alerts.py @@ -7,7 +7,7 @@ from django.shortcuts import get_object_or_404, redirect from django.template.loader import render_to_string from django.utils.decorators import method_decorator -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import FormView from zds.member.decorator import LoginRequiredMixin diff --git a/zds/tutorialv2/views/archives.py b/zds/tutorialv2/views/archives.py index 3f97c70811..51c98e18ae 100644 --- a/zds/tutorialv2/views/archives.py +++ b/zds/tutorialv2/views/archives.py @@ -10,7 +10,7 @@ from django.conf import settings from django.contrib import messages from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import FormView from easy_thumbnails.files import get_thumbnailer diff --git a/zds/tutorialv2/views/authors.py b/zds/tutorialv2/views/authors.py index 075dfe2b16..6ef42cd5f2 100644 --- a/zds/tutorialv2/views/authors.py +++ b/zds/tutorialv2/views/authors.py @@ -5,7 +5,7 @@ from django.template.loader import render_to_string from django.urls import reverse from django.utils.text import format_lazy -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.gallery.models import UserGallery, GALLERY_WRITE from zds.member.decorator import LoggedWithReadWriteHability diff --git a/zds/tutorialv2/views/beta.py b/zds/tutorialv2/views/beta.py index 7aa21854ee..4fc8380620 100644 --- a/zds/tutorialv2/views/beta.py +++ b/zds/tutorialv2/views/beta.py @@ -5,7 +5,7 @@ from django.shortcuts import get_object_or_404 from django.template.loader import render_to_string from django.utils.decorators import method_decorator -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.forum.models import Topic, Forum, mark_read from zds.member.decorator import LoggedWithReadWriteHability diff --git a/zds/tutorialv2/views/comments.py b/zds/tutorialv2/views/comments.py index 361384b8ee..6ed7c249f8 100644 --- a/zds/tutorialv2/views/comments.py +++ b/zds/tutorialv2/views/comments.py @@ -9,7 +9,7 @@ from django.template.loader import render_to_string from django.utils.datastructures import MultiValueDictKeyError from django.utils.decorators import method_decorator -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import FormView from zds import json_handler diff --git a/zds/tutorialv2/views/containers_extracts.py b/zds/tutorialv2/views/containers_extracts.py index 13418c862b..ba5d429011 100644 --- a/zds/tutorialv2/views/containers_extracts.py +++ b/zds/tutorialv2/views/containers_extracts.py @@ -6,7 +6,7 @@ from django.http import JsonResponse, Http404 from django.shortcuts import redirect from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import DeleteView, FormView from zds.member.decorator import LoggedWithReadWriteHability, LoginRequiredMixin diff --git a/zds/tutorialv2/views/contents.py b/zds/tutorialv2/views/contents.py index 79878a2fdc..0c770ea5da 100644 --- a/zds/tutorialv2/views/contents.py +++ b/zds/tutorialv2/views/contents.py @@ -9,7 +9,7 @@ from django.template.loader import render_to_string from django.urls import reverse from django.utils.decorators import method_decorator -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import DeleteView from zds.gallery.models import Gallery, Image diff --git a/zds/tutorialv2/views/contributors.py b/zds/tutorialv2/views/contributors.py index cbe6d5a079..2fcc49d6e7 100644 --- a/zds/tutorialv2/views/contributors.py +++ b/zds/tutorialv2/views/contributors.py @@ -9,7 +9,7 @@ from django.template.loader import render_to_string from django.urls import reverse from django.utils.text import format_lazy -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.member.decorator import LoggedWithReadWriteHability from zds.notification.models import NewPublicationSubscription diff --git a/zds/tutorialv2/views/display.py b/zds/tutorialv2/views/display.py index 0e7526fe51..175948a44f 100644 --- a/zds/tutorialv2/views/display.py +++ b/zds/tutorialv2/views/display.py @@ -2,7 +2,7 @@ from django.conf import settings from django.http import Http404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.featured.mixins import FeatureableMixin from zds.tutorialv2 import signals diff --git a/zds/tutorialv2/views/editorialization.py b/zds/tutorialv2/views/editorialization.py index 2fe36256e0..3dce2fe721 100644 --- a/zds/tutorialv2/views/editorialization.py +++ b/zds/tutorialv2/views/editorialization.py @@ -1,7 +1,7 @@ from django.contrib import messages from django.core.exceptions import PermissionDenied from django.shortcuts import get_object_or_404, redirect -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.member.decorator import LoggedWithReadWriteHability from zds.tutorialv2.forms import RemoveSuggestionForm, EditContentTagsForm diff --git a/zds/tutorialv2/views/help.py b/zds/tutorialv2/views/help.py index 59478e06d8..dc533d2937 100644 --- a/zds/tutorialv2/views/help.py +++ b/zds/tutorialv2/views/help.py @@ -3,7 +3,7 @@ from django.conf import settings from django.db.models import Count, Q from django.http import HttpResponse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.member.decorator import LoggedWithReadWriteHability from zds.tutorialv2.forms import ToggleHelpForm diff --git a/zds/tutorialv2/views/lists.py b/zds/tutorialv2/views/lists.py index 2975ad1aa2..dcd332cfd5 100644 --- a/zds/tutorialv2/views/lists.py +++ b/zds/tutorialv2/views/lists.py @@ -2,7 +2,7 @@ from django.contrib.auth.models import User from django.core.exceptions import PermissionDenied -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.conf import settings from django.db.models import Count from django.http import Http404 diff --git a/zds/tutorialv2/views/misc.py b/zds/tutorialv2/views/misc.py index 911ff64d7a..aba750c6a7 100644 --- a/zds/tutorialv2/views/misc.py +++ b/zds/tutorialv2/views/misc.py @@ -5,7 +5,7 @@ from django.http import HttpResponse, Http404 from django.shortcuts import redirect from django.template.loader import render_to_string -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import FormView from zds import json_handler diff --git a/zds/tutorialv2/views/statistics.py b/zds/tutorialv2/views/statistics.py index 6f95a496f2..ad6a3189b3 100644 --- a/zds/tutorialv2/views/statistics.py +++ b/zds/tutorialv2/views/statistics.py @@ -4,7 +4,7 @@ from django.conf import settings from django.contrib import messages from django.core.exceptions import PermissionDenied -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import FormView import googleapiclient diff --git a/zds/tutorialv2/views/validations_contents.py b/zds/tutorialv2/views/validations_contents.py index b7510d036d..482bfedc93 100644 --- a/zds/tutorialv2/views/validations_contents.py +++ b/zds/tutorialv2/views/validations_contents.py @@ -10,7 +10,7 @@ from django.http import Http404 from django.shortcuts import get_object_or_404, redirect from django.template.loader import render_to_string -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import ListView, FormView from zds.member.decorator import LoginRequiredMixin, PermissionRequiredMixin, LoggedWithReadWriteHability diff --git a/zds/tutorialv2/views/validations_opinions.py b/zds/tutorialv2/views/validations_opinions.py index d8358c2392..54a492a5cd 100644 --- a/zds/tutorialv2/views/validations_opinions.py +++ b/zds/tutorialv2/views/validations_opinions.py @@ -10,7 +10,7 @@ from django.shortcuts import get_object_or_404 from django.template.loader import render_to_string from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import FormView, ListView from zds.gallery.models import Gallery diff --git a/zds/utils/forms.py b/zds/utils/forms.py index 72ee9fb9e8..002e637059 100644 --- a/zds/utils/forms.py +++ b/zds/utils/forms.py @@ -2,7 +2,7 @@ from crispy_forms.bootstrap import StrictButton from crispy_forms.layout import Layout, ButtonHolder, Field, Div, HTML -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.template import defaultfilters from zds.utils.models import Tag from zds.utils.misc import contains_utf8mb4 diff --git a/zds/utils/header_notifications.py b/zds/utils/header_notifications.py index c5f24a0227..fc00b9e909 100644 --- a/zds/utils/header_notifications.py +++ b/zds/utils/header_notifications.py @@ -1,5 +1,5 @@ from django.contrib.contenttypes.models import ContentType -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from zds.forum.models import Post from zds.mp.models import PrivateTopic diff --git a/zds/utils/mixins.py b/zds/utils/mixins.py index e8b5a7d94a..2b6ac2c6cf 100644 --- a/zds/utils/mixins.py +++ b/zds/utils/mixins.py @@ -1,7 +1,7 @@ from django.core.exceptions import ImproperlyConfigured, PermissionDenied from django.http import Http404 from django.shortcuts import get_object_or_404 -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.conf import settings from zds.utils.models import Comment diff --git a/zds/utils/models.py b/zds/utils/models.py index 212a38b169..24ffe02e7c 100644 --- a/zds/utils/models.py +++ b/zds/utils/models.py @@ -12,7 +12,7 @@ from django.utils.encoding import smart_str from django.db import models from django.shortcuts import get_object_or_404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.dispatch import receiver from django.template.loader import render_to_string diff --git a/zds/utils/templatetags/date.py b/zds/utils/templatetags/date.py index 0386c4d956..f3f91e8ef1 100644 --- a/zds/utils/templatetags/date.py +++ b/zds/utils/templatetags/date.py @@ -4,7 +4,7 @@ from django.contrib.humanize.templatetags.humanize import naturaltime from django.template.defaultfilters import date from django.utils.timezone import get_default_timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ register = template.Library() diff --git a/zds/utils/templatetags/emarkdown.py b/zds/utils/templatetags/emarkdown.py index ec39b20232..14ed4f106c 100644 --- a/zds/utils/templatetags/emarkdown.py +++ b/zds/utils/templatetags/emarkdown.py @@ -7,7 +7,7 @@ from django.conf import settings from django.template.defaultfilters import stringfilter from django.utils.safestring import mark_safe -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ logger = logging.getLogger(__name__) register = template.Library() diff --git a/zds/utils/templatetags/feminize.py b/zds/utils/templatetags/feminize.py index d41c8d3ca4..e355e3e585 100644 --- a/zds/utils/templatetags/feminize.py +++ b/zds/utils/templatetags/feminize.py @@ -1,5 +1,5 @@ from django import template -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ register = template.Library() articles = {_("le"): _("la"), _("un"): _("une"), _("Nouveau"): _("Nouvelle"), _("Ce"): _("Cette")} diff --git a/zds/utils/templatetags/htmldiff.py b/zds/utils/templatetags/htmldiff.py index c27bb95b3d..22417c19c6 100644 --- a/zds/utils/templatetags/htmldiff.py +++ b/zds/utils/templatetags/htmldiff.py @@ -2,7 +2,7 @@ from django import template from django.utils.html import format_html from django.utils.safestring import mark_safe -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ register = template.Library() diff --git a/zds/utils/templatetags/interventions.py b/zds/utils/templatetags/interventions.py index 6efe416547..5f44369720 100644 --- a/zds/utils/templatetags/interventions.py +++ b/zds/utils/templatetags/interventions.py @@ -1,7 +1,7 @@ from datetime import datetime, timedelta from django import template -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.db.models import F from zds.forum.models import is_read as topic_is_read diff --git a/zds/utils/templatetags/joinby.py b/zds/utils/templatetags/joinby.py index c124c3dd61..3f87cb6d82 100644 --- a/zds/utils/templatetags/joinby.py +++ b/zds/utils/templatetags/joinby.py @@ -1,5 +1,5 @@ from django import template -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ register = template.Library() diff --git a/zds/utils/templatetags/minute_to_duration.py b/zds/utils/templatetags/minute_to_duration.py index ac693ec74f..0bfff5c479 100644 --- a/zds/utils/templatetags/minute_to_duration.py +++ b/zds/utils/templatetags/minute_to_duration.py @@ -1,6 +1,6 @@ from django import template from django.template import defaultfilters as filters -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ import datetime register = template.Library()