Merge branch 'develop' of github.com:saxix/django-concurrency into develop

* 'develop' of github.com:saxix/django-concurrency:
  replace ugettext with gettext for Django 4 preparation

Author: saxix

src/concurrency/exceptions.py

@@ -1,6 +1,6 @@
 from django.core.exceptions import SuspiciousOperation, ValidationError
 from django.db import DatabaseError
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 
 class VersionChangedError(ValidationError):

src/concurrency/forms.py

@@ -5,7 +5,7 @@
 from django.core.signing import BadSignature, Signer
 from django.forms import HiddenInput, ModelForm
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from concurrency.config import conf
 from concurrency.core import _select_lock

src/concurrency/views.py

@@ -1,7 +1,7 @@
 from django.http import HttpResponse
 from django.template import loader
 from django.template.base import Template
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from concurrency.compat import TemplateDoesNotExist
 from concurrency.exceptions import RecordModifiedError

tests/test_admin_edit.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 import pytest
 from demo.base import SENTINEL, AdminTestCase

tests/test_forms.py

@@ -4,7 +4,7 @@
 from django.test import TestCase, override_settings
 from django.test.testcases import SimpleTestCase
 from django.utils.encoding import smart_str
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 import pytest
 from demo.models import Issue3TestModel, SimpleConcurrentModel