diff --git a/dbtemplates/admin.py b/dbtemplates/admin.py index 9bfefa7..1c9095f 100644 --- a/dbtemplates/admin.py +++ b/dbtemplates/admin.py @@ -3,15 +3,18 @@ from django import forms from django.contrib import admin from django.core.exceptions import ImproperlyConfigured try: - from django.utils.translation import ungettext, ugettext_lazy as _ + # Django 4.0 + from django.utils.translation import gettext_lazy as _ + from django.utils.translation import ngettext except ImportError: - from django.utils.translation import ngettext as ungettext, \ - gettext_lazy as _ + # Before Django 4.0 + from django.utils.translation import ugettext_lazy as _ + from django.utils.translation import ungettext as ngettext + from django.utils.safestring import mark_safe from dbtemplates.conf import settings -from dbtemplates.models import (Template, remove_cached_template, - add_template_to_cache) +from dbtemplates.models import Template, add_template_to_cache, remove_cached_template from dbtemplates.utils.template import check_template_syntax # Check if either django-reversion-compare or django-reversion is installed and @@ -125,7 +128,7 @@ class TemplateAdmin(TemplateModelAdmin): for template in queryset: remove_cached_template(template) count = queryset.count() - message = ungettext( + message = ngettext( "Cache of one template successfully invalidated.", "Cache of %(count)d templates successfully invalidated.", count) @@ -137,7 +140,7 @@ class TemplateAdmin(TemplateModelAdmin): for template in queryset: add_template_to_cache(template) count = queryset.count() - message = ungettext( + message = ngettext( "Cache successfully repopulated with one template.", "Cache successfully repopulated with %(count)d templates.", count) @@ -153,7 +156,7 @@ class TemplateAdmin(TemplateModelAdmin): errors.append(f'{template.name}: {error}') if errors: count = len(errors) - message = ungettext( + message = ngettext( "Template syntax check FAILED for %(names)s.", "Template syntax check FAILED for " "%(count)d templates: %(names)s.", @@ -162,7 +165,7 @@ class TemplateAdmin(TemplateModelAdmin): {'count': count, 'names': ', '.join(errors)}) else: count = queryset.count() - message = ungettext( + message = ngettext( "Template syntax OK.", "Template syntax OK for %(count)d templates.", count) self.message_user(request, message % {'count': count})