replaced ugettext* calls with corresponding gettext* calls (#68183)

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

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

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
 

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

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
 

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

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
 

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

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

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

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
 

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
 

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

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

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

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

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

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

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

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

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

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

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
 

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

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

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
 

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

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
 

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

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
 

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

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

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

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
 

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

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

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
 

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

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 (

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

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

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
 

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

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
 

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
 

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
 

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

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

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

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,

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

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

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
 

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