From 703e3e4ba6ba7127cbd6a1bbf2597504089ba78c Mon Sep 17 00:00:00 2001 From: ZahraEbrahimi01 <93347447+ZahraEbrahimi01@users.noreply.github.com> Date: Wed, 14 Dec 2022 14:01:17 +0330 Subject: [PATCH] Complete translation with gettext_lazy (#474) --- auditlog/admin.py | 3 ++- auditlog/apps.py | 3 ++- auditlog/filters.py | 3 ++- auditlog/mixins.py | 11 ++++++----- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/auditlog/admin.py b/auditlog/admin.py index 0ba5354..a2e8511 100644 --- a/auditlog/admin.py +++ b/auditlog/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin from django.contrib.auth import get_user_model +from django.utils.translation import gettext_lazy as _ from auditlog.filters import ResourceTypeFilter from auditlog.mixins import LogEntryAdminMixin @@ -22,7 +23,7 @@ class LogEntryAdmin(admin.ModelAdmin, LogEntryAdminMixin): readonly_fields = ["created", "resource_url", "action", "user_url", "msg"] fieldsets = [ (None, {"fields": ["created", "user_url", "resource_url"]}), - ("Changes", {"fields": ["action", "msg"]}), + (_("Changes"), {"fields": ["action", "msg"]}), ] def has_add_permission(self, request): diff --git a/auditlog/apps.py b/auditlog/apps.py index 0e9266e..f6bf3fb 100644 --- a/auditlog/apps.py +++ b/auditlog/apps.py @@ -1,9 +1,10 @@ from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ class AuditlogConfig(AppConfig): name = "auditlog" - verbose_name = "Audit log" + verbose_name = _("Audit log") default_auto_field = "django.db.models.AutoField" def ready(self): diff --git a/auditlog/filters.py b/auditlog/filters.py index 21591ac..d2323c9 100644 --- a/auditlog/filters.py +++ b/auditlog/filters.py @@ -1,8 +1,9 @@ from django.contrib.admin import SimpleListFilter +from django.utils.translation import gettext_lazy as _ class ResourceTypeFilter(SimpleListFilter): - title = "Resource Type" + title = _("Resource Type") parameter_name = "resource_type" def lookups(self, request, model_admin): diff --git a/auditlog/mixins.py b/auditlog/mixins.py index 5636480..c5b430b 100644 --- a/auditlog/mixins.py +++ b/auditlog/mixins.py @@ -9,6 +9,7 @@ from django.urls.exceptions import NoReverseMatch from django.utils.html import format_html, format_html_join from django.utils.safestring import mark_safe from django.utils.timezone import localtime +from django.utils.translation import gettext_lazy as _ from auditlog.models import LogEntry from auditlog.registry import auditlog @@ -18,11 +19,11 @@ MAX = 75 class LogEntryAdminMixin: - @admin.display(description="Created") + @admin.display(description=_("Created")) def created(self, obj): return localtime(obj.timestamp) - @admin.display(description="User") + @admin.display(description=_("User")) def user_url(self, obj): if obj.actor: app_label, model = settings.AUTH_USER_MODEL.split(".") @@ -35,7 +36,7 @@ class LogEntryAdminMixin: return "system" - @admin.display(description="Resource") + @admin.display(description=_("Resource")) def resource_url(self, obj): app_label, model = obj.content_type.app_label, obj.content_type.model viewname = f"admin:{app_label}_{model}_change" @@ -49,7 +50,7 @@ class LogEntryAdminMixin: '{} - {}', link, obj.content_type, obj.object_repr ) - @admin.display(description="Changes") + @admin.display(description=_("Changes")) def msg_short(self, obj): if obj.action in [LogEntry.Action.DELETE, LogEntry.Action.ACCESS]: return "" # delete @@ -61,7 +62,7 @@ class LogEntryAdminMixin: fields = fields[:i] + " .." return "%d change%s: %s" % (len(changes), s, fields) - @admin.display(description="Changes") + @admin.display(description=_("Changes")) def msg(self, obj): changes = json.loads(obj.changes)