From cb6c422f26b1f70b2472ae420c29b2d31089c3fd Mon Sep 17 00:00:00 2001
From: Agate Berriot <aberriot@entrouvert.com>
Date: Tue, 16 Aug 2022 14:14:49 +0200
Subject: [PATCH 1/5] replaced ugettext* calls with corresponding gettext*
 calls (#68183)

---
 combo/apps/assets/__init__.py                 | 2 +-
 combo/apps/assets/forms.py                    | 2 +-
 combo/apps/assets/views.py                    | 2 +-
 combo/apps/calendar/__init__.py               | 2 +-
 combo/apps/calendar/forms.py                  | 2 +-
 combo/apps/calendar/models.py                 | 2 +-
 combo/apps/calendar/utils.py                  | 2 +-
 combo/apps/dashboard/__init__.py              | 2 +-
 combo/apps/dashboard/models.py                | 2 +-
 combo/apps/dataviz/__init__.py                | 2 +-
 combo/apps/dataviz/forms.py                   | 2 +-
 combo/apps/dataviz/models.py                  | 2 +-
 combo/apps/dataviz/views.py                   | 2 +-
 combo/apps/family/__init__.py                 | 2 +-
 combo/apps/family/models.py                   | 2 +-
 combo/apps/fargo/__init__.py                  | 2 +-
 combo/apps/fargo/models.py                    | 2 +-
 combo/apps/gallery/__init__.py                | 2 +-
 combo/apps/gallery/models.py                  | 2 +-
 combo/apps/kb/__init__.py                     | 2 +-
 combo/apps/kb/models.py                       | 2 +-
 combo/apps/lingo/__init__.py                  | 2 +-
 combo/apps/lingo/forms.py                     | 2 +-
 combo/apps/lingo/manager_views.py             | 2 +-
 combo/apps/lingo/models.py                    | 2 +-
 combo/apps/lingo/views.py                     | 2 +-
 combo/apps/maps/__init__.py                   | 2 +-
 combo/apps/maps/forms.py                      | 2 +-
 combo/apps/maps/manager_views.py              | 2 +-
 combo/apps/maps/models.py                     | 2 +-
 combo/apps/notifications/__init__.py          | 2 +-
 combo/apps/notifications/models.py            | 2 +-
 combo/apps/pwa/__init__.py                    | 2 +-
 combo/apps/pwa/forms.py                       | 2 +-
 combo/apps/pwa/manager_views.py               | 2 +-
 combo/apps/pwa/models.py                      | 2 +-
 combo/apps/search/__init__.py                 | 2 +-
 combo/apps/search/forms.py                    | 2 +-
 combo/apps/search/manager_views.py            | 2 +-
 combo/apps/search/models.py                   | 2 +-
 combo/apps/wcs/__init__.py                    | 2 +-
 combo/apps/wcs/forms.py                       | 2 +-
 combo/apps/wcs/models.py                      | 2 +-
 combo/apps/wcs/views.py                       | 2 +-
 combo/data/forms.py                           | 2 +-
 combo/data/management/commands/export_site.py | 2 +-
 combo/data/models.py                          | 2 +-
 combo/data/utils.py                           | 2 +-
 combo/manager/forms.py                        | 2 +-
 combo/manager/views.py                        | 2 +-
 combo/profile/__init__.py                     | 2 +-
 combo/profile/models.py                       | 2 +-
 combo/public/views.py                         | 2 +-
 combo/settings.py                             | 2 +-
 54 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/combo/apps/assets/__init__.py b/combo/apps/assets/__init__.py
index e9e9d8f8..86c7cbbc 100644
--- a/combo/apps/assets/__init__.py
+++ b/combo/apps/assets/__init__.py
@@ -16,7 +16,7 @@
 
 import django.apps
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/assets/forms.py b/combo/apps/assets/forms.py
index 414e0c02..f280e3d2 100644
--- a/combo/apps/assets/forms.py
+++ b/combo/apps/assets/forms.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AssetUploadForm(forms.Form):
diff --git a/combo/apps/assets/views.py b/combo/apps/assets/views.py
index e8f78f3f..2fc29f44 100644
--- a/combo/apps/assets/views.py
+++ b/combo/apps/assets/views.py
@@ -26,7 +26,7 @@ from django.core.files.storage import default_storage
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse, reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import FormView, ListView, TemplateView
 from sorl.thumbnail.shortcuts import get_thumbnail
 
diff --git a/combo/apps/calendar/__init__.py b/combo/apps/calendar/__init__.py
index 1067e80d..e1948718 100644
--- a/combo/apps/calendar/__init__.py
+++ b/combo/apps/calendar/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import django.apps
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/calendar/forms.py b/combo/apps/calendar/forms.py
index a6b87c29..9113f2c9 100644
--- a/combo/apps/calendar/forms.py
+++ b/combo/apps/calendar/forms.py
@@ -16,7 +16,7 @@
 
 from django import forms
 from django.utils.dateparse import parse_datetime, parse_time
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.apps.wcs.utils import get_wcs_options
 
diff --git a/combo/apps/calendar/models.py b/combo/apps/calendar/models.py
index 4fe98e8a..6686e648 100644
--- a/combo/apps/calendar/models.py
+++ b/combo/apps/calendar/models.py
@@ -18,7 +18,7 @@ import datetime
 
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.data.library import register_cell_class
 from combo.data.models import CellBase
diff --git a/combo/apps/calendar/utils.py b/combo/apps/calendar/utils.py
index 0c271a4d..75c61397 100644
--- a/combo/apps/calendar/utils.py
+++ b/combo/apps/calendar/utils.py
@@ -22,7 +22,7 @@ from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.utils.dateparse import parse_datetime
 from django.utils.http import urlencode
 from django.utils.timezone import localtime, make_aware
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.utils import requests
 
diff --git a/combo/apps/dashboard/__init__.py b/combo/apps/dashboard/__init__.py
index 48e836d6..abf21da6 100644
--- a/combo/apps/dashboard/__init__.py
+++ b/combo/apps/dashboard/__init__.py
@@ -13,7 +13,7 @@
 
 import django.apps
 from django.utils.timezone import now, timedelta
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/dashboard/models.py b/combo/apps/dashboard/models.py
index e7e71440..f1a9d1d2 100644
--- a/combo/apps/dashboard/models.py
+++ b/combo/apps/dashboard/models.py
@@ -21,7 +21,7 @@ from django.contrib.contenttypes import fields
 from django.contrib.contenttypes.models import ContentType
 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 combo.data.library import register_cell_class
 from combo.data.models import CellBase, ValidityInfo
diff --git a/combo/apps/dataviz/__init__.py b/combo/apps/dataviz/__init__.py
index eaebe438..fbfc8484 100644
--- a/combo/apps/dataviz/__init__.py
+++ b/combo/apps/dataviz/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import django.apps
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/dataviz/forms.py b/combo/apps/dataviz/forms.py
index ea57832f..890fdf63 100644
--- a/combo/apps/dataviz/forms.py
+++ b/combo/apps/dataviz/forms.py
@@ -24,7 +24,7 @@ from django.db import transaction
 from django.db.models import Q
 from django.db.models.fields import BLANK_CHOICE_DASH
 from django.template import Context, Template, TemplateSyntaxError, VariableDoesNotExist
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.utils import cache_during_request, requests, spooler
 
diff --git a/combo/apps/dataviz/models.py b/combo/apps/dataviz/models.py
index 32f3bb7e..f88520ba 100644
--- a/combo/apps/dataviz/models.py
+++ b/combo/apps/dataviz/models.py
@@ -34,7 +34,7 @@ from django.utils.dates import WEEKDAYS
 from django.utils.encoding import force_text
 from django.utils.functional import cached_property
 from django.utils.translation import gettext
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ungettext
 from requests.exceptions import RequestException
 
diff --git a/combo/apps/dataviz/views.py b/combo/apps/dataviz/views.py
index 29105e6e..d26b8c4b 100644
--- a/combo/apps/dataviz/views.py
+++ b/combo/apps/dataviz/views.py
@@ -20,7 +20,7 @@ from django.core.exceptions import PermissionDenied
 from django.http import Http404, HttpResponse, HttpResponseBadRequest
 from django.shortcuts import render
 from django.template import TemplateSyntaxError, VariableDoesNotExist
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.clickjacking import xframe_options_sameorigin
 from django.views.generic import DetailView
 from requests.exceptions import HTTPError
diff --git a/combo/apps/family/__init__.py b/combo/apps/family/__init__.py
index 3df97b0d..2a5df971 100644
--- a/combo/apps/family/__init__.py
+++ b/combo/apps/family/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import django.apps
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/family/models.py b/combo/apps/family/models.py
index 03b21fdd..1847f72f 100644
--- a/combo/apps/family/models.py
+++ b/combo/apps/family/models.py
@@ -16,7 +16,7 @@
 
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.data.library import register_cell_class
 from combo.data.models import JsonCellBase, django_template_validator
diff --git a/combo/apps/fargo/__init__.py b/combo/apps/fargo/__init__.py
index 4ac07e0b..2cb64c5a 100644
--- a/combo/apps/fargo/__init__.py
+++ b/combo/apps/fargo/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import django.apps
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/fargo/models.py b/combo/apps/fargo/models.py
index ba7b3fd9..c100caa3 100644
--- a/combo/apps/fargo/models.py
+++ b/combo/apps/fargo/models.py
@@ -20,7 +20,7 @@ from django.conf import settings
 from django.db import models
 from django.forms import Select
 from django.forms import models as model_forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests import HTTPError, RequestException
 
 from combo.data.library import register_cell_class
diff --git a/combo/apps/gallery/__init__.py b/combo/apps/gallery/__init__.py
index 30edd06d..dab54177 100644
--- a/combo/apps/gallery/__init__.py
+++ b/combo/apps/gallery/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import django.apps
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/gallery/models.py b/combo/apps/gallery/models.py
index 37b96a72..389aa2b2 100644
--- a/combo/apps/gallery/models.py
+++ b/combo/apps/gallery/models.py
@@ -19,7 +19,7 @@ import json
 from django import forms
 from django.core import serializers
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.data.library import register_cell_class
 from combo.data.models import CellBase
diff --git a/combo/apps/kb/__init__.py b/combo/apps/kb/__init__.py
index 6336152c..b9f7a7ee 100644
--- a/combo/apps/kb/__init__.py
+++ b/combo/apps/kb/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import django.apps
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/kb/models.py b/combo/apps/kb/models.py
index 2acc5128..5b66de21 100644
--- a/combo/apps/kb/models.py
+++ b/combo/apps/kb/models.py
@@ -17,7 +17,7 @@
 import itertools
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.data.library import register_cell_class
 from combo.data.models import CellBase, Page
diff --git a/combo/apps/lingo/__init__.py b/combo/apps/lingo/__init__.py
index 8ae7beba..1ff71f44 100644
--- a/combo/apps/lingo/__init__.py
+++ b/combo/apps/lingo/__init__.py
@@ -23,7 +23,7 @@ from django.db import transaction
 from django.db.models.signals import post_migrate
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/lingo/forms.py b/combo/apps/lingo/forms.py
index ec2af936..376e092c 100644
--- a/combo/apps/lingo/forms.py
+++ b/combo/apps/lingo/forms.py
@@ -18,7 +18,7 @@ import datetime
 
 from django import forms
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .models import PaymentBackend, Regie
 
diff --git a/combo/apps/lingo/manager_views.py b/combo/apps/lingo/manager_views.py
index f0b4d097..e66fc22f 100644
--- a/combo/apps/lingo/manager_views.py
+++ b/combo/apps/lingo/manager_views.py
@@ -27,7 +27,7 @@ from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.urls import reverse, reverse_lazy
 from django.utils.timezone import make_aware, now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, DeleteView, ListView, UpdateView, View
 
 from .forms import PaymentBackendForm, RegieForm, TransactionExportForm, TransactionSearchForm
diff --git a/combo/apps/lingo/models.py b/combo/apps/lingo/models.py
index c214f718..766e770a 100644
--- a/combo/apps/lingo/models.py
+++ b/combo/apps/lingo/models.py
@@ -41,7 +41,7 @@ from django.utils import dateparse, timezone
 from django.utils.encoding import force_bytes
 from django.utils.formats import localize
 from django.utils.timezone import make_aware, now, utc
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests import RequestException
 
 from combo.apps.notifications.models import Notification
diff --git a/combo/apps/lingo/views.py b/combo/apps/lingo/views.py
index 8287785b..dbff092e 100644
--- a/combo/apps/lingo/views.py
+++ b/combo/apps/lingo/views.py
@@ -42,7 +42,7 @@ from django.urls import reverse
 from django.utils import dateparse
 from django.utils.encoding import force_text, smart_text
 from django.utils.http import urlencode
-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 DetailView, ListView, TemplateView, View
 
diff --git a/combo/apps/maps/__init__.py b/combo/apps/maps/__init__.py
index 6e9fe404..f5052af2 100644
--- a/combo/apps/maps/__init__.py
+++ b/combo/apps/maps/__init__.py
@@ -16,7 +16,7 @@
 
 import django.apps
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/maps/forms.py b/combo/apps/maps/forms.py
index 5b047d3a..cf9af9ff 100644
--- a/combo/apps/maps/forms.py
+++ b/combo/apps/maps/forms.py
@@ -17,7 +17,7 @@
 from django import forms
 from django.utils.encoding import force_text
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.data.fields import TemplatableURLField
 
diff --git a/combo/apps/maps/manager_views.py b/combo/apps/maps/manager_views.py
index a8ab0249..c018d83a 100644
--- a/combo/apps/maps/manager_views.py
+++ b/combo/apps/maps/manager_views.py
@@ -17,7 +17,7 @@
 from django.http import Http404
 from django.shortcuts import get_object_or_404
 from django.urls import reverse, reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, DeleteView, ListView, UpdateView
 
 from combo.data.models import CellBase, PageSnapshot
diff --git a/combo/apps/maps/models.py b/combo/apps/maps/models.py
index c858d718..ee287ec6 100644
--- a/combo/apps/maps/models.py
+++ b/combo/apps/maps/models.py
@@ -26,7 +26,7 @@ from django.db.models import OuterRef, Subquery
 from django.urls import reverse
 from django.utils.html import escape
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests.exceptions import RequestException
 from requests.models import PreparedRequest
 
diff --git a/combo/apps/notifications/__init__.py b/combo/apps/notifications/__init__.py
index 0fc03230..c64ca77b 100644
--- a/combo/apps/notifications/__init__.py
+++ b/combo/apps/notifications/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import django.apps
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/notifications/models.py b/combo/apps/notifications/models.py
index 8c7a8c4a..6e1a4286 100644
--- a/combo/apps/notifications/models.py
+++ b/combo/apps/notifications/models.py
@@ -22,7 +22,7 @@ from django.db.models import Q
 from django.db.models.query import QuerySet
 from django.utils.encoding import force_text
 from django.utils.timezone import now, timedelta
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.apps.pwa.models import PwaSettings
 from combo.data.library import register_cell_class
diff --git a/combo/apps/pwa/__init__.py b/combo/apps/pwa/__init__.py
index b5d26b3a..46b5538d 100644
--- a/combo/apps/pwa/__init__.py
+++ b/combo/apps/pwa/__init__.py
@@ -16,7 +16,7 @@
 
 import django.apps
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/pwa/forms.py b/combo/apps/pwa/forms.py
index f2a8507b..1ecc611f 100644
--- a/combo/apps/pwa/forms.py
+++ b/combo/apps/pwa/forms.py
@@ -16,7 +16,7 @@
 
 from django import forms
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .models import PwaSettings
 
diff --git a/combo/apps/pwa/manager_views.py b/combo/apps/pwa/manager_views.py
index b6fb1e98..ecbaf95d 100644
--- a/combo/apps/pwa/manager_views.py
+++ b/combo/apps/pwa/manager_views.py
@@ -18,7 +18,7 @@ from django import forms
 from django.db.models import Max
 from django.http import JsonResponse
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, DeleteView, UpdateView
 
 from combo.data.forms import get_page_choices
diff --git a/combo/apps/pwa/models.py b/combo/apps/pwa/models.py
index cdfb3f18..b3713e3b 100644
--- a/combo/apps/pwa/models.py
+++ b/combo/apps/pwa/models.py
@@ -26,7 +26,7 @@ from django.core.files.base import ContentFile
 from django.core.files.storage import default_storage
 from django.db import models
 from django.utils.encoding import force_bytes, force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from py_vapid import Vapid
 
 from combo import utils
diff --git a/combo/apps/search/__init__.py b/combo/apps/search/__init__.py
index 1aaa8ceb..e15981d9 100644
--- a/combo/apps/search/__init__.py
+++ b/combo/apps/search/__init__.py
@@ -16,7 +16,7 @@
 
 import django.apps
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .engines import engines
 
diff --git a/combo/apps/search/forms.py b/combo/apps/search/forms.py
index 03da406a..ba9d6d44 100644
--- a/combo/apps/search/forms.py
+++ b/combo/apps/search/forms.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.data.models import Page
 from combo.profile import default_description_template
diff --git a/combo/apps/search/manager_views.py b/combo/apps/search/manager_views.py
index 9d1d22a9..e016d00c 100644
--- a/combo/apps/search/manager_views.py
+++ b/combo/apps/search/manager_views.py
@@ -17,7 +17,7 @@
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 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 View
 
 from combo.apps.search.forms import (
diff --git a/combo/apps/search/models.py b/combo/apps/search/models.py
index 5dd612ac..a6630390 100644
--- a/combo/apps/search/models.py
+++ b/combo/apps/search/models.py
@@ -26,7 +26,7 @@ from django.shortcuts import get_object_or_404
 from django.template import RequestContext, Template
 from django.utils.functional import cached_property
 from django.utils.http import quote
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.data.library import register_cell_class
 from combo.data.models import CellBase, Page
diff --git a/combo/apps/wcs/__init__.py b/combo/apps/wcs/__init__.py
index 7a2ca1d9..0d9eb82c 100644
--- a/combo/apps/wcs/__init__.py
+++ b/combo/apps/wcs/__init__.py
@@ -20,8 +20,8 @@ import django.apps
 from django.conf import settings
 from django.urls import reverse
 from django.utils.encoding import force_bytes
+from django.utils.translation import gettext_lazy as _
 from django.utils.translation import pgettext_lazy
-from django.utils.translation import ugettext_lazy as _
 
 
 class AppConfig(django.apps.AppConfig):
diff --git a/combo/apps/wcs/forms.py b/combo/apps/wcs/forms.py
index 33608c6a..60e21de6 100644
--- a/combo/apps/wcs/forms.py
+++ b/combo/apps/wcs/forms.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.utils.forms import MultiSortWidget
 
diff --git a/combo/apps/wcs/models.py b/combo/apps/wcs/models.py
index 7f673a49..1f99ef64 100644
--- a/combo/apps/wcs/models.py
+++ b/combo/apps/wcs/models.py
@@ -29,7 +29,7 @@ from django.template import Context, RequestContext, Template, TemplateSyntaxErr
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests.exceptions import RequestException
 
 from combo.data.library import register_cell_class
diff --git a/combo/apps/wcs/views.py b/combo/apps/wcs/views.py
index 95ce66c2..aaa3967d 100644
--- a/combo/apps/wcs/views.py
+++ b/combo/apps/wcs/views.py
@@ -23,7 +23,7 @@ from django.contrib import messages
 from django.core.exceptions import DisallowedRedirect, PermissionDenied
 from django.http import HttpResponseBadRequest, HttpResponseForbidden, HttpResponseRedirect, JsonResponse
 from django.utils.http import urlquote
-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 View
 
diff --git a/combo/data/forms.py b/combo/data/forms.py
index ba5746c9..2c32fe5f 100644
--- a/combo/data/forms.py
+++ b/combo/data/forms.py
@@ -19,7 +19,7 @@ import copy
 from django import forms
 from django.conf import settings
 from django.template import Template, TemplateSyntaxError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.utils import cache_during_request
 
diff --git a/combo/data/management/commands/export_site.py b/combo/data/management/commands/export_site.py
index 73ab9019..acb9a174 100644
--- a/combo/data/management/commands/export_site.py
+++ b/combo/data/management/commands/export_site.py
@@ -18,7 +18,7 @@ import json
 import sys
 
 from django.core.management.base import BaseCommand, CommandError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.data.utils import export_site, export_site_tar
 
diff --git a/combo/data/models.py b/combo/data/models.py
index cd1fc976..809dcb50 100644
--- a/combo/data/models.py
+++ b/combo/data/models.py
@@ -61,7 +61,7 @@ from django.utils.html import strip_tags
 from django.utils.safestring import mark_safe
 from django.utils.text import slugify
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo import utils
 from combo.utils import NothingInCacheException
diff --git a/combo/data/utils.py b/combo/data/utils.py
index 440bb36b..a5f70f62 100644
--- a/combo/data/utils.py
+++ b/combo/data/utils.py
@@ -21,7 +21,7 @@ from django.conf import settings
 from django.contrib.auth.models import Group
 from django.core.serializers.base import DeserializationError
 from django.db import transaction
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.apps.assets.models import Asset
 from combo.apps.assets.utils import add_tar_content, clean_assets_files, tar_assets_files, untar_assets_files
diff --git a/combo/manager/forms.py b/combo/manager/forms.py
index 6d96ace3..c6375cc8 100644
--- a/combo/manager/forms.py
+++ b/combo/manager/forms.py
@@ -23,7 +23,7 @@ from django.core.exceptions import ValidationError
 from django.forms import formset_factory
 from django.template import Template, TemplateSyntaxError
 from django.template.loader import TemplateDoesNotExist, get_template
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.data.forms import get_page_choices
 from combo.data.models import Page, ParentContentCell, SiteSettings, compile_sub_slug
diff --git a/combo/manager/views.py b/combo/manager/views.py
index d7771ee1..0d7b6f78 100644
--- a/combo/manager/views.py
+++ b/combo/manager/views.py
@@ -40,7 +40,7 @@ from django.urls import reverse, reverse_lazy
 from django.utils.encoding import force_bytes, force_text
 from django.utils.formats import date_format
 from django.utils.timezone import localtime
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt, requires_csrf_token
 from django.views.generic import (
     CreateView,
diff --git a/combo/profile/__init__.py b/combo/profile/__init__.py
index fe0f1b28..2636dbd4 100644
--- a/combo/profile/__init__.py
+++ b/combo/profile/__init__.py
@@ -17,7 +17,7 @@
 
 
 import django.apps
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 def user_get_name_id(user):
diff --git a/combo/profile/models.py b/combo/profile/models.py
index ea467cb7..2a3dd59b 100644
--- a/combo/profile/models.py
+++ b/combo/profile/models.py
@@ -20,7 +20,7 @@ from collections import OrderedDict
 from django.conf import settings
 from django.db import models
 from django.utils.dateparse import parse_date
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from combo.data.library import register_cell_class
 from combo.data.models import JsonCellBase
diff --git a/combo/public/views.py b/combo/public/views.py
index ec09a894..1685a9fa 100644
--- a/combo/public/views.py
+++ b/combo/public/views.py
@@ -42,7 +42,7 @@ from django.template.loader import TemplateDoesNotExist, get_template
 from django.utils import lorem_ipsum, timezone
 from django.utils.encoding import force_text
 from django.utils.http import urlencode
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.decorators.csrf import csrf_exempt
 from django.views.defaults import page_not_found
 
diff --git a/combo/settings.py b/combo/settings.py
index 49c81c84..9a4ec5ad 100644
--- a/combo/settings.py
+++ b/combo/settings.py
@@ -27,7 +27,7 @@ import copy
 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__))
-- 
2.36.1