Replace ugettext with gettext

apps/approval/dashboard/views.py

@@ -7,7 +7,7 @@
 from django.http import Http404, HttpResponse
 from django.shortcuts import render
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.decorators.csrf import ensure_csrf_cookie
 from guardian.decorators import permission_required
 

apps/approval/forms.py

@@ -2,7 +2,7 @@
 
 from django import forms
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from apps.authentication.constants import FieldOfStudyType
 

apps/approval/models.py

@@ -5,7 +5,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from apps.approval import settings as approval_settings
 from apps.authentication.constants import FieldOfStudyType

apps/approval/views.py

@@ -7,7 +7,7 @@
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from apps.approval.forms import FieldOfStudyApplicationForm
 from apps.approval.models import MembershipApproval

apps/article/models.py

@@ -8,7 +8,7 @@
 from django.db.models import SET_NULL
 from django.template.defaultfilters import slugify
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from taggit.managers import TaggableManager
 from unidecode import unidecode
 

apps/authentication/admin.py

@@ -2,7 +2,7 @@
 
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from reversion.admin import VersionAdmin
 
 from apps.authentication.models import (

apps/authentication/constants.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 
 class GroupType:

apps/authentication/forms.py

@@ -4,7 +4,7 @@
 
 from django import forms
 from django.contrib import auth
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from apps.authentication.models import Email
 from apps.authentication.models import OnlineUser as User

apps/authentication/models.py

@@ -11,7 +11,7 @@
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.html import strip_tags
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from rest_framework.exceptions import NotAcceptable
 
 from apps.authentication.constants import FieldOfStudyType, GroupType, RoleType

apps/careeropportunity/models.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from taggit.managers import TaggableManager
 
 from apps.companyprofile.models import Company

apps/companyprofile/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from apps.gallery.models import ResponsiveImage
 

apps/events/admin.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from django.contrib import admin, messages
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from guardian.admin import GuardedModelAdmin
 from reversion.admin import VersionAdmin
 

apps/events/dashboard/views.py

@@ -12,7 +12,7 @@
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic import CreateView, DeleteView, UpdateView
 from guardian.decorators import permission_required
 from guardian.shortcuts import get_objects_for_user

apps/events/forms.py

@@ -2,7 +2,7 @@
 from captcha.fields import ReCaptchaField
 from django import forms
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from apps.authentication.models import OnlineUser as User
 from apps.marks.models import MarkRuleSet

apps/events/models.py

@@ -21,7 +21,7 @@
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from guardian.shortcuts import assign_perm
 from unidecode import unidecode
 

apps/events/views.py

@@ -11,7 +11,7 @@
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from guardian.shortcuts import get_objects_for_user
 from rest_framework import mixins, permissions, status, viewsets
 from rest_framework.decorators import action

apps/feedback/models.py

@@ -18,7 +18,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from apps.authentication.constants import FieldOfStudyType
 from apps.authentication.models import OnlineUser

apps/feedback/serializers.py

@@ -1,7 +1,7 @@
 import logging
 from collections import OrderedDict
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from rest_framework import serializers
 
 from .models import (

apps/feedback/tests/base_tests.py

@@ -8,7 +8,7 @@
 from django.test.client import Client
 from django.urls import reverse
 from django.utils import timezone as timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django_dynamic_fixture import G
 
 from apps.authentication.models import Email, OnlineGroup

apps/feedback/views.py

@@ -9,7 +9,7 @@
 from django.db.models import Prefetch
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import mixins, permissions, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response

apps/gallery/models.py

@@ -5,7 +5,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 taggit.managers import TaggableManager
 
 from apps.gallery import settings as gallery_settings

apps/inventory/models.py

@@ -4,7 +4,7 @@
 from django.core.mail import EmailMessage
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from apps.gallery.models import ResponsiveImage
 

apps/marks/admin.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from django.contrib import admin
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from reversion.admin import VersionAdmin
 
 from apps.marks.models import Mark, MarkRuleSet, MarkUser, Suspension

apps/marks/models.py

@@ -5,7 +5,7 @@
 from django.conf import settings
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 User = settings.AUTH_USER_MODEL
 

apps/offline/models.py

@@ -5,7 +5,7 @@
 from chunks.models import Chunk
 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 apps.gallery.models import ResponsiveImage
 

apps/online_oidc_provider/claims.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from oidc_provider.lib.claims import ScopeClaims
 
 from apps.sso.userinfo import Onlineweb4Userinfo

apps/payment/models.py

@@ -11,7 +11,7 @@
 from django.db import models
 from django.template.loader import render_to_string
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from apps.authentication.models import OnlineGroup
 from apps.events.models import AttendanceEvent, Attendee

apps/payment/mommy.py

@@ -8,7 +8,7 @@
 from django.core.mail import EmailMessage
 from django.template.loader import render_to_string
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from pytz import timezone as tz
 
 from apps.events.models import AttendanceEvent, Attendee

apps/payment/views.py

@@ -3,7 +3,7 @@
 import logging
 
 import stripe
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from rest_framework import permissions, status, viewsets
 from rest_framework.response import Response
 from stripe.error import InvalidRequestError, StripeError

apps/posters/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from reversion.admin import VersionAdmin
 
 from .models import Poster

apps/posters/dashboard/views.py

@@ -11,7 +11,7 @@
     redirect,
     render,
 )
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.decorators.csrf import ensure_csrf_cookie
 from guardian.decorators import permission_required
 

apps/posters/models.py

@@ -4,7 +4,7 @@
 from django.contrib.auth.models import Group
 from django.db import models
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from apps.events.models import Event
 

apps/profiles/forms.py

@@ -3,7 +3,7 @@
 
 from django import forms
 from django.contrib import auth
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from apps.authentication.models import OnlineUser, Position
 from apps.profiles.models import Privacy

apps/profiles/models.py

@@ -2,7 +2,7 @@
 
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 User = settings.AUTH_USER_MODEL
 

apps/profiles/views.py

@@ -16,7 +16,7 @@
 from django.http import Http404, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views import View
 from django_filters.rest_framework import DjangoFilterBackend
 from googleapiclient.errors import HttpError

apps/sso/models.py

@@ -3,7 +3,7 @@
 # Created by 'myth' on 6/25/15
 
 from django.db.models import TextField
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from oauth2_provider.models import AbstractApplication