Hopiu/django-dbtemplates
1
0
Fork 0
mirror of https://github.com/jazzband/django-dbtemplates.git synced 2026-03-16 22:20:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to Django 4.0 i18n style

Browse source
This commit is contained in:
Michał Pasternak 2022-08-09 17:38:39 +02:00
parent e08a8d3950
commit 36fbb80fc0
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dbtemplates/admin.py
View file

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