Renomme les fonctions ugettext() en gettext()

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
 

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

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

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

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

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

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

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

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

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
 

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

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
 

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 (

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"))]

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

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"

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

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

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 (

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
 

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

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
 

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

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
 

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

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

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
 

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):

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

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

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"

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

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

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

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

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

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

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

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

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
 

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 = (

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