Merge pull request #893 from smithdc1/master

Added support for Django 4.0

.github/workflows/python-package.yml

@@ -43,12 +43,18 @@ jobs:
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9]
         django-version:
+          - '>=4.0a1,<4.1'
           - '>=3.2,<4.0'
           - '>=3.1,<3.2'
           - '>=3.0,<3.1'
           - '>=2.2,<3.0'
           - '>=2.1,<2.2'
           - '>=2.0,<2.1'
+        exclude:
+          - python-version: 3.6
+            django-version: '>=4.0a1,<4.1'
+          - python-version: 3.7
+            django-version: '>=4.0a1,<4.1'   
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

reversion/admin.py

@@ -10,7 +10,7 @@
 from django.urls import reverse, re_path
 from django.utils.text import capfirst
 from django.utils.timezone import template_localtime
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.utils.encoding import force_str
 from django.utils.formats import localize
 from reversion.errors import RevertError