Merge pull request #9719 from jumpserver/pr@dev@fix_operatelog_i18n

fix: 操作日志的国际化应该根据查询对象的语言决定

apps/audits/backends/db.py

@@ -51,7 +51,7 @@ class OperateLogStore(object):
         for k, v in raw_diff.items():
             before, after = v.split(cls.SEP, 1)
             diff_list.append({
-                'field': k,
+                'field': _(k),
                 'before': before if before else _('empty'),
                 'after': after if after else _('empty'),
             })

apps/audits/serializers.py

@@ -80,6 +80,8 @@ class OperateLogActionDetailSerializer(serializers.ModelSerializer):
 
 class OperateLogSerializer(serializers.ModelSerializer):
     action = LabeledChoiceField(choices=ActionChoices.choices, label=_("Action"))
+    resource = serializers.SerializerMethodField(label=_("Resource"))
+    resource_type = serializers.SerializerMethodField(label=_('Resource Type'))
 
     class Meta:
         model = models.OperateLog
@@ -91,6 +93,14 @@ class OperateLogSerializer(serializers.ModelSerializer):
         ]
         fields = fields_small
 
+    @staticmethod
+    def get_resource_type(instance):
+        return _(instance.resource_type)
+
+    @staticmethod
+    def get_resource(instance):
+        return i18n_trans(instance.resource)
+
 
 class PasswordChangeLogSerializer(serializers.ModelSerializer):
     class Meta:

apps/audits/signal_handlers/operate_log.py

@@ -5,6 +5,7 @@ import uuid
 from django.apps import apps
 from django.db.models.signals import post_save, pre_save, m2m_changed, pre_delete
 from django.dispatch import receiver
+from django.utils import translation
 
 from audits.handler import (
     get_instance_current_with_cache_diff, cache_instance_before_data,
@@ -29,6 +30,7 @@ def on_m2m_changed(sender, action, instance, reverse, model, pk_set, **kwargs):
     if not instance:
         return
 
+    with translation.override('en'):
         resource_type = instance._meta.verbose_name
         current_instance = model_to_dict(instance, include_model_fields=False)
 
@@ -93,7 +95,7 @@ def on_object_pre_create_or_update(
     )
     if not ok:
         return
-
+    with translation.override('en'):
         # users.PrivateToken Model 没有 id 有 pk字段
         instance_id = getattr(instance, 'id', getattr(instance, 'pk', None))
         instance_before_data = {'id': instance_id}
@@ -116,7 +118,7 @@ def on_object_created_or_update(
     )
     if not ok:
         return
-
+    with translation.override('en'):
         log_id, before, after = None, None, None
         if created:
             action = ActionChoices.create
@@ -141,6 +143,7 @@ def on_object_delete(sender, instance=None, **kwargs):
     if not ok:
         return
 
+    with translation.override('en'):
         resource_type = sender._meta.verbose_name
         create_or_update_operate_log(
             ActionChoices.delete, resource_type,

apps/audits/utils.py

@@ -45,15 +45,6 @@ def write_login_log(*args, **kwargs):
     UserLoginLog.objects.create(**kwargs)
 
 
-def get_resource_display(resource):
-    resource_display = str(resource)
-    setting_serializer = SettingsSerializer()
-    label = setting_serializer.get_field_label(resource_display)
-    if label is not None:
-        resource_display = label
-    return resource_display
-
-
 def _get_instance_field_value(
         instance, include_model_fields,
         model_need_continue_fields, exclude_fields=None

apps/common/views/mixins.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.http.response import JsonResponse
@@ -66,6 +67,7 @@ class RecordViewLogMixin:
 
     def list(self, request, *args, **kwargs):
         response = super().list(request, *args, **kwargs)
+        with translation.override('en'):
             resource_display = self.get_resource_display(request)
             resource_type = self.model._meta.verbose_name
         create_or_update_operate_log(
@@ -76,6 +78,7 @@ class RecordViewLogMixin:
 
     def retrieve(self, request, *args, **kwargs):
         response = super().retrieve(request, *args, **kwargs)
+        with translation.override('en'):
             resource_type = self.model._meta.verbose_name
             create_or_update_operate_log(
                 self.ACTION, resource_type, force=True, resource=self.get_object()

apps/settings/serializers/settings.py

@@ -1,7 +1,9 @@
 # coding: utf-8
 from django.core.cache import cache
-from django.utils.translation import ugettext_lazy as _
+from django.utils import translation
+from django.utils.translation import gettext_noop, ugettext_lazy as _
 
+from common.utils import i18n_fmt
 from .basic import BasicSettingSerializer
 from .other import OtherSettingSerializer
 from .email import EmailSettingSerializer, EmailContentSettingSerializer
@@ -55,13 +57,16 @@ class SettingsSerializer(
 
     # 单次计算量不大，搞个缓存，以防操作日志大量写入时，这里影响性能
     def get_field_label(self, field_name):
+        self.fields_label_mapping = cache.get(self.CACHE_KEY, None)
         if self.fields_label_mapping is None:
             self.fields_label_mapping = {}
+            with translation.override('en'):
                 for subclass in SettingsSerializer.__bases__:
                     prefix = getattr(subclass, 'PREFIX_TITLE', _('Setting'))
                     fields = subclass().get_fields()
                     for name, item in fields.items():
-                    label = '[%s] %s' % (prefix, getattr(item, 'label', ''))
-                    self.fields_label_mapping[name] = label
+                        label = getattr(item, 'label', '')
+                        detail = i18n_fmt(gettext_noop('[%s] %s'), prefix, label)
+                        self.fields_label_mapping[name] = detail
             cache.set(self.CACHE_KEY, self.fields_label_mapping, 3600 * 24)
         return self.fields_label_mapping.get(field_name)