github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修改审计日志中的i18n翻译问题

pull/7521/head
Michael Bai 2022-01-18 12:25:28 +08:00 committed by 老广
parent ec68fc9562
commit c9f63a3f4a
6 changed files with 120 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/audits/models.py
View File

@ -2,8 +2,9 @@ import uuid
from django.db import models from django.db import models
from django.db.models import Q from django.db.models import Q
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import gettext, ugettext_lazy as _
from django.utils import timezone from django.utils import timezone
from common.utils import lazyproperty
from orgs.mixins.models import OrgModelMixin, Organization from orgs.mixins.models import OrgModelMixin, Organization
from orgs.utils import current_org from orgs.utils import current_org
@ -63,6 +64,10 @@ class OperateLog(OrgModelMixin):
def __str__(self): def __str__(self):
return "<{}> {} <{}>".format(self.user, self.action, self.resource) return "<{}> {} <{}>".format(self.user, self.action, self.resource)
@lazyproperty
def resource_type_display(self):
return gettext(self.resource_type)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if current_org.is_root() and not self.org_id: if current_org.is_root() and not self.org_id:
self.org_id = Organization.ROOT_ID self.org_id = Organization.ROOT_ID
@ -113,6 +118,10 @@ class UserLoginLog(models.Model):
datetime = models.DateTimeField(default=timezone.now, verbose_name=_('Date login')) datetime = models.DateTimeField(default=timezone.now, verbose_name=_('Date login'))
backend = models.CharField(max_length=32, default='', verbose_name=_('Authentication backend')) backend = models.CharField(max_length=32, default='', verbose_name=_('Authentication backend'))
@property
def backend_display(self):
return gettext(self.backend)
@classmethod @classmethod
def get_login_logs(cls, date_from=None, date_to=None, user=None, keyword=None): def get_login_logs(cls, date_from=None, date_to=None, user=None, keyword=None):
login_logs = cls.objects.all() login_logs = cls.objects.all()

13
apps/audits/serializers.py
View File

@ -35,14 +35,15 @@ class UserLoginLogSerializer(serializers.ModelSerializer):
fields_mini = ['id'] fields_mini = ['id']
fields_small = fields_mini + [ fields_small = fields_mini + [
'username', 'type', 'type_display', 'ip', 'city', 'user_agent', 'username', 'type', 'type_display', 'ip', 'city', 'user_agent',
'mfa', 'mfa_display', 'reason', 'reason_display', 'backend', 'mfa', 'mfa_display', 'reason', 'reason_display', 'backend', 'backend_display',
'status', 'status_display', 'status', 'status_display',
'datetime', 'datetime',
] ]
fields = fields_small fields = fields_small
extra_kwargs = { extra_kwargs = {
"user_agent": {'label': _('User agent')}, "user_agent": {'label': _('User agent')},
"reason_display": {'label': _('Reason display')} "reason_display": {'label': _('Reason display')},
'backend_display': {'label': _('Authentication backend')}
} }
@ -51,11 +52,13 @@ class OperateLogSerializer(serializers.ModelSerializer):
model = models.OperateLog model = models.OperateLog
fields_mini = ['id'] fields_mini = ['id']
fields_small = fields_mini + [ fields_small = fields_mini + [
'user', 'action', 'resource_type', 'resource', 'remote_addr', 'user', 'action', 'resource_type', 'resource_type_display', 'resource',
'datetime', 'remote_addr', 'datetime', 'org_id'
'org_id'
] ]
fields = fields_small fields = fields_small
extra_kwargs = {
'resource_type_display': {'label': _('Resource Type')}
}
class PasswordChangeLogSerializer(serializers.ModelSerializer): class PasswordChangeLogSerializer(serializers.ModelSerializer):

9
apps/audits/signals_handler.py
View File

@ -10,6 +10,7 @@ from django.utils import timezone
from django.utils.functional import LazyObject from django.utils.functional import LazyObject
from django.contrib.auth import BACKEND_SESSION_KEY from django.contrib.auth import BACKEND_SESSION_KEY
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils import translation
from rest_framework.renderers import JSONRenderer from rest_framework.renderers import JSONRenderer
from rest_framework.request import Request from rest_framework.request import Request
@ -83,7 +84,8 @@ def create_operate_log(action, sender, resource):
model_name = sender._meta.object_name model_name = sender._meta.object_name
if model_name not in MODELS_NEED_RECORD: if model_name not in MODELS_NEED_RECORD:
return return
resource_type = sender._meta.verbose_name with translation.override('en'):
resource_type = sender._meta.verbose_name
remote_addr = get_request_ip(current_request) remote_addr = get_request_ip(current_request)
data = { data = {
@ -290,13 +292,16 @@ def generate_data(username, request, login_type=None):
if login_type is None: if login_type is None:
login_type = 'W' login_type = 'W'
with translation.override('en'):
backend = str(get_login_backend(request))
data = { data = {
'username': username, 'username': username,
'ip': login_ip, 'ip': login_ip,
'type': login_type, 'type': login_type,
'user_agent': user_agent[0:254], 'user_agent': user_agent[0:254],
'datetime': timezone.now(), 'datetime': timezone.now(),
'backend': get_login_backend(request) 'backend': backend,
} }
return data return data

4
apps/locale/zh/LC_MESSAGES/django.mo
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a08014e3eed6152aaff1e42758f20666f0e90e1ed4264a9d7cd44e34191d607e oid sha256:f5da08d38cfcbeb214b02eed26a9bdd0cd3bb3ff00ce0613ad940a2900dc7c95
size 96692 size 96832

208
apps/locale/zh/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n" "Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-01-18 10:33+0800\n" "POT-Creation-Date: 2022-01-18 12:23+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n" "Language-Team: JumpServer team<ibuler@qq.com>\n"
@ -81,8 +81,8 @@ msgid "Login confirm"
msgstr "登录复核" msgstr "登录复核"
#: acls/models/login_acl.py:24 acls/models/login_asset_acl.py:20 #: acls/models/login_acl.py:24 acls/models/login_asset_acl.py:20
#: assets/models/cmd_filter.py:26 assets/models/label.py:15 audits/models.py:36 #: assets/models/cmd_filter.py:26 assets/models/label.py:15 audits/models.py:37
#: audits/models.py:56 audits/models.py:74 audits/serializers.py:94 #: audits/models.py:57 audits/models.py:79 audits/serializers.py:97
#: authentication/models.py:47 orgs/models.py:19 orgs/models.py:433 #: authentication/models.py:47 orgs/models.py:19 orgs/models.py:433
#: perms/models/base.py:84 templates/index.html:78 #: perms/models/base.py:84 templates/index.html:78
#: terminal/backends/command/models.py:19 #: terminal/backends/command/models.py:19
@ -104,7 +104,7 @@ msgstr "规则"
#: acls/models/login_acl.py:31 acls/models/login_asset_acl.py:26 #: acls/models/login_acl.py:31 acls/models/login_asset_acl.py:26
#: acls/serializers/login_acl.py:17 acls/serializers/login_asset_acl.py:75 #: acls/serializers/login_acl.py:17 acls/serializers/login_asset_acl.py:75
#: assets/models/cmd_filter.py:80 audits/models.py:57 #: assets/models/cmd_filter.py:80 audits/models.py:58
#: authentication/templates/authentication/_access_key_modal.html:34 #: authentication/templates/authentication/_access_key_modal.html:34
#: users/templates/users/_granted_assets.html:29 #: users/templates/users/_granted_assets.html:29
#: users/templates/users/user_asset_permission.html:44 #: users/templates/users/user_asset_permission.html:44
@ -133,7 +133,7 @@ msgstr "系统用户"
#: assets/models/asset.py:356 assets/models/authbook.py:19 #: assets/models/asset.py:356 assets/models/authbook.py:19
#: assets/models/backup.py:31 assets/models/cmd_filter.py:34 #: assets/models/backup.py:31 assets/models/cmd_filter.py:34
#: assets/models/gathered_user.py:14 assets/serializers/system_user.py:264 #: assets/models/gathered_user.py:14 assets/serializers/system_user.py:264
#: audits/models.py:38 perms/models/asset_permission.py:24 #: audits/models.py:39 perms/models/asset_permission.py:24
#: templates/index.html:82 terminal/backends/command/models.py:20 #: templates/index.html:82 terminal/backends/command/models.py:20
#: terminal/backends/command/serializers.py:13 terminal/models/session.py:42 #: terminal/backends/command/serializers.py:13 terminal/models/session.py:42
#: terminal/notifications.py:89 #: terminal/notifications.py:89
@ -158,7 +158,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. "
#: acls/serializers/login_acl.py:15 acls/serializers/login_asset_acl.py:17 #: acls/serializers/login_acl.py:15 acls/serializers/login_asset_acl.py:17
#: acls/serializers/login_asset_acl.py:51 assets/models/base.py:176 #: acls/serializers/login_asset_acl.py:51 assets/models/base.py:176
#: assets/models/gathered_user.py:15 audits/models.py:105 #: assets/models/gathered_user.py:15 audits/models.py:110
#: authentication/forms.py:15 authentication/forms.py:17 #: authentication/forms.py:15 authentication/forms.py:17
#: authentication/templates/authentication/_msg_different_city.html:9 #: authentication/templates/authentication/_msg_different_city.html:9
#: authentication/templates/authentication/_msg_oauth_bind.html:9 #: authentication/templates/authentication/_msg_oauth_bind.html:9
@ -264,7 +264,7 @@ msgid "Custom"
msgstr "自定义" msgstr "自定义"
#: applications/models/account.py:15 assets/models/authbook.py:20 #: applications/models/account.py:15 assets/models/authbook.py:20
#: assets/models/cmd_filter.py:38 assets/models/user.py:302 audits/models.py:39 #: assets/models/cmd_filter.py:38 assets/models/user.py:302 audits/models.py:40
#: perms/models/application_permission.py:32 #: perms/models/application_permission.py:32
#: perms/models/asset_permission.py:26 templates/_nav.html:45 #: perms/models/asset_permission.py:26 templates/_nav.html:45
#: terminal/backends/command/models.py:21 #: terminal/backends/command/models.py:21
@ -634,7 +634,7 @@ msgstr "手动触发"
msgid "Timing trigger" msgid "Timing trigger"
msgstr "定时触发" msgstr "定时触发"
#: assets/models/backup.py:105 audits/models.py:43 ops/models/command.py:30 #: assets/models/backup.py:105 audits/models.py:44 ops/models/command.py:30
#: perms/models/base.py:89 terminal/models/session.py:54 #: perms/models/base.py:89 terminal/models/session.py:54
#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:55 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:55
#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:57 #: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:57
@ -663,15 +663,15 @@ msgstr "账号备份快照"
msgid "Trigger mode" msgid "Trigger mode"
msgstr "触发模式" msgstr "触发模式"
#: assets/models/backup.py:119 audits/models.py:111 #: assets/models/backup.py:119 audits/models.py:116
#: terminal/models/sharing.py:88 #: terminal/models/sharing.py:88
#: xpack/plugins/change_auth_plan/models/base.py:198 #: xpack/plugins/change_auth_plan/models/base.py:198
#: xpack/plugins/cloud/models.py:176 #: xpack/plugins/cloud/models.py:176
msgid "Reason" msgid "Reason"
msgstr "原因" msgstr "原因"
#: assets/models/backup.py:121 audits/serializers.py:76 #: assets/models/backup.py:121 audits/serializers.py:79
#: audits/serializers.py:91 ops/models/adhoc.py:259 #: audits/serializers.py:94 ops/models/adhoc.py:259
#: terminal/serializers/session.py:35 #: terminal/serializers/session.py:35
#: xpack/plugins/change_auth_plan/models/base.py:199 #: xpack/plugins/change_auth_plan/models/base.py:199
msgid "Is success" msgid "Is success"
@ -689,7 +689,7 @@ msgstr "未知"
msgid "Ok" msgid "Ok"
msgstr "成功" msgstr "成功"
#: assets/models/base.py:32 audits/models.py:102 #: assets/models/base.py:32 audits/models.py:107
#: xpack/plugins/change_auth_plan/task_handlers/base/manager.py:121 #: xpack/plugins/change_auth_plan/task_handlers/base/manager.py:121
#: xpack/plugins/cloud/const.py:29 #: xpack/plugins/cloud/const.py:29
msgid "Failed" msgid "Failed"
@ -703,7 +703,7 @@ msgstr "可连接性"
msgid "Date verified" msgid "Date verified"
msgstr "校验日期" msgstr "校验日期"
#: assets/models/base.py:177 audits/signals_handler.py:65 #: assets/models/base.py:177 audits/signals_handler.py:66
#: authentication/forms.py:22 #: authentication/forms.py:22
#: authentication/templates/authentication/login.html:151 #: authentication/templates/authentication/login.html:151
#: settings/serializers/auth/ldap.py:44 users/forms/profile.py:21 #: settings/serializers/auth/ldap.py:44 users/forms/profile.py:21
@ -1275,131 +1275,131 @@ msgstr "为了安全，禁止推送用户 {}"
msgid "No assets matched, stop task" msgid "No assets matched, stop task"
msgstr "没有匹配到资产，结束任务" msgstr "没有匹配到资产，结束任务"
#: audits/models.py:26 audits/models.py:53 #: audits/models.py:27 audits/models.py:54
#: authentication/templates/authentication/_access_key_modal.html:65 #: authentication/templates/authentication/_access_key_modal.html:65
#: users/templates/users/user_asset_permission.html:128 #: users/templates/users/user_asset_permission.html:128
#: users/templates/users/user_database_app_permission.html:111 #: users/templates/users/user_database_app_permission.html:111
msgid "Delete" msgid "Delete"
msgstr "删除" msgstr "删除"
#: audits/models.py:27 #: audits/models.py:28
msgid "Upload" msgid "Upload"
msgstr "上传文件" msgstr "上传文件"
#: audits/models.py:28 #: audits/models.py:29
msgid "Download" msgid "Download"
msgstr "下载文件" msgstr "下载文件"
#: audits/models.py:29 #: audits/models.py:30
msgid "Rmdir" msgid "Rmdir"
msgstr "删除目录" msgstr "删除目录"
#: audits/models.py:30 #: audits/models.py:31
msgid "Rename" msgid "Rename"
msgstr "重命名" msgstr "重命名"
#: audits/models.py:31 #: audits/models.py:32
msgid "Mkdir" msgid "Mkdir"
msgstr "创建目录" msgstr "创建目录"
#: audits/models.py:32 #: audits/models.py:33
msgid "Symlink" msgid "Symlink"
msgstr "建立软链接" msgstr "建立软链接"
#: audits/models.py:37 audits/models.py:60 audits/models.py:76 #: audits/models.py:38 audits/models.py:61 audits/models.py:81
#: terminal/models/session.py:47 terminal/models/sharing.py:76 #: terminal/models/session.py:47 terminal/models/sharing.py:76
msgid "Remote addr" msgid "Remote addr"
msgstr "远端地址" msgstr "远端地址"
#: audits/models.py:40 #: audits/models.py:41
msgid "Operate" msgid "Operate"
msgstr "操作" msgstr "操作"
#: audits/models.py:41 #: audits/models.py:42
msgid "Filename" msgid "Filename"
msgstr "文件名" msgstr "文件名"
#: audits/models.py:42 audits/models.py:101 terminal/models/sharing.py:84 #: audits/models.py:43 audits/models.py:106 terminal/models/sharing.py:84
#: xpack/plugins/change_auth_plan/task_handlers/base/manager.py:119 #: xpack/plugins/change_auth_plan/task_handlers/base/manager.py:119
msgid "Success" msgid "Success"
msgstr "成功" msgstr "成功"
#: audits/models.py:51 #: audits/models.py:52
#: authentication/templates/authentication/_access_key_modal.html:22 #: authentication/templates/authentication/_access_key_modal.html:22
msgid "Create" msgid "Create"
msgstr "创建" msgstr "创建"
#: audits/models.py:52 templates/_csv_import_export.html:18 #: audits/models.py:53 templates/_csv_import_export.html:18
#: templates/_csv_update_modal.html:6 #: templates/_csv_update_modal.html:6
#: users/templates/users/user_asset_permission.html:127 #: users/templates/users/user_asset_permission.html:127
#: users/templates/users/user_database_app_permission.html:110 #: users/templates/users/user_database_app_permission.html:110
msgid "Update" msgid "Update"
msgstr "更新" msgstr "更新"
#: audits/models.py:58 #: audits/models.py:59 audits/serializers.py:60
msgid "Resource Type" msgid "Resource Type"
msgstr "资源类型" msgstr "资源类型"
#: audits/models.py:59 #: audits/models.py:60
msgid "Resource" msgid "Resource"
msgstr "资源" msgstr "资源"
#: audits/models.py:61 audits/models.py:77 #: audits/models.py:62 audits/models.py:82
msgid "Datetime" msgid "Datetime"
msgstr "日期" msgstr "日期"
#: audits/models.py:75 #: audits/models.py:80
msgid "Change by" msgid "Change by"
msgstr "修改者" msgstr "修改者"
#: audits/models.py:95 #: audits/models.py:100
msgid "Disabled" msgid "Disabled"
msgstr "禁用" msgstr "禁用"
#: audits/models.py:96 settings/models.py:33 #: audits/models.py:101 settings/models.py:33
msgid "Enabled" msgid "Enabled"
msgstr "启用" msgstr "启用"
#: audits/models.py:97 #: audits/models.py:102
msgid "-" msgid "-"
msgstr "" msgstr ""
#: audits/models.py:106 #: audits/models.py:111
msgid "Login type" msgid "Login type"
msgstr "登录方式" msgstr "登录方式"
#: audits/models.py:107 #: audits/models.py:112
#: tickets/serializers/ticket/meta/ticket_type/login_confirm.py:14 #: tickets/serializers/ticket/meta/ticket_type/login_confirm.py:14
msgid "Login ip" msgid "Login ip"
msgstr "登录IP" msgstr "登录IP"
#: audits/models.py:108 #: audits/models.py:113
#: authentication/templates/authentication/_msg_different_city.html:11 #: authentication/templates/authentication/_msg_different_city.html:11
#: tickets/serializers/ticket/meta/ticket_type/login_confirm.py:17 #: tickets/serializers/ticket/meta/ticket_type/login_confirm.py:17
msgid "Login city" msgid "Login city"
msgstr "登录城市" msgstr "登录城市"
#: audits/models.py:109 audits/serializers.py:44 #: audits/models.py:114 audits/serializers.py:44
msgid "User agent" msgid "User agent"
msgstr "用户代理" msgstr "用户代理"
#: audits/models.py:110 #: audits/models.py:115
#: authentication/templates/authentication/_mfa_confirm_modal.html:14 #: authentication/templates/authentication/_mfa_confirm_modal.html:14
#: users/forms/profile.py:64 users/models/user.py:571 #: users/forms/profile.py:64 users/models/user.py:571
#: users/serializers/profile.py:123 #: users/serializers/profile.py:123
msgid "MFA" msgid "MFA"
msgstr "MFA" msgstr "MFA"
#: audits/models.py:112 tickets/models/ticket.py:61 #: audits/models.py:117 tickets/models/ticket.py:61
#: xpack/plugins/cloud/models.py:172 xpack/plugins/cloud/models.py:221 #: xpack/plugins/cloud/models.py:172 xpack/plugins/cloud/models.py:221
msgid "Status" msgid "Status"
msgstr "状态" msgstr "状态"
#: audits/models.py:113 #: audits/models.py:118
msgid "Date login" msgid "Date login"
msgstr "登录日期" msgstr "登录日期"
#: audits/models.py:114 #: audits/models.py:119 audits/serializers.py:46
msgid "Authentication backend" msgid "Authentication backend"
msgstr "认证方式" msgstr "认证方式"
@ -1419,234 +1419,234 @@ msgstr "MFA名称"
msgid "Reason display" msgid "Reason display"
msgstr "原因描述" msgstr "原因描述"
#: audits/serializers.py:78 #: audits/serializers.py:81
msgid "Hosts display" msgid "Hosts display"
msgstr "主机名称" msgstr "主机名称"
#: audits/serializers.py:90 ops/models/command.py:26 #: audits/serializers.py:93 ops/models/command.py:26
#: xpack/plugins/cloud/models.py:170 #: xpack/plugins/cloud/models.py:170
msgid "Result" msgid "Result"
msgstr "结果" msgstr "结果"
#: audits/serializers.py:92 terminal/serializers/storage.py:151 #: audits/serializers.py:95 terminal/serializers/storage.py:151
msgid "Hosts" msgid "Hosts"
msgstr "主机" msgstr "主机"
#: audits/serializers.py:93 #: audits/serializers.py:96
msgid "Run as" msgid "Run as"
msgstr "运行用户" msgstr "运行用户"
#: audits/serializers.py:95 #: audits/serializers.py:98
msgid "Run as display" msgid "Run as display"
msgstr "运行用户名称" msgstr "运行用户名称"
#: audits/serializers.py:96 #: audits/serializers.py:99
msgid "User display" msgid "User display"
msgstr "用户名称" msgstr "用户名称"
#: audits/signals_handler.py:64 #: audits/signals_handler.py:65
msgid "SSH Key" msgid "SSH Key"
msgstr "SSH 密钥" msgstr "SSH 密钥"
#: audits/signals_handler.py:66 #: audits/signals_handler.py:67
msgid "SSO" msgid "SSO"
msgstr "" msgstr ""
#: audits/signals_handler.py:67 #: audits/signals_handler.py:68
msgid "Auth Token" msgid "Auth Token"
msgstr "认证令牌" msgstr "认证令牌"
#: audits/signals_handler.py:68 authentication/notifications.py:73 #: audits/signals_handler.py:69 authentication/notifications.py:73
#: authentication/views/login.py:164 authentication/views/wecom.py:158 #: authentication/views/login.py:164 authentication/views/wecom.py:158
#: notifications/backends/__init__.py:11 users/models/user.py:607 #: notifications/backends/__init__.py:11 users/models/user.py:607
msgid "WeCom" msgid "WeCom"
msgstr "企业微信" msgstr "企业微信"
#: audits/signals_handler.py:69 authentication/views/dingtalk.py:160 #: audits/signals_handler.py:70 authentication/views/dingtalk.py:160
#: authentication/views/login.py:170 notifications/backends/__init__.py:12 #: authentication/views/login.py:170 notifications/backends/__init__.py:12
#: users/models/user.py:608 #: users/models/user.py:608
msgid "DingTalk" msgid "DingTalk"
msgstr "钉钉" msgstr "钉钉"
#: audits/signals_handler.py:102 #: audits/signals_handler.py:104
msgid "User and Organization" msgid "User and Organization"
msgstr "用户与组织" msgstr "用户与组织"
#: audits/signals_handler.py:103 #: audits/signals_handler.py:105
#, python-brace-format #, python-brace-format
msgid "{User} JOINED {Organization}" msgid "{User} JOINED {Organization}"
msgstr "{User} 加入 {Organization}" msgstr "{User} 加入 {Organization}"
#: audits/signals_handler.py:104 #: audits/signals_handler.py:106
#, python-brace-format #, python-brace-format
msgid "{User} LEFT {Organization}" msgid "{User} LEFT {Organization}"
msgstr "{User} 离开 {Organization}" msgstr "{User} 离开 {Organization}"
#: audits/signals_handler.py:107 #: audits/signals_handler.py:109
msgid "User and Group" msgid "User and Group"
msgstr "用户与用户组" msgstr "用户与用户组"
#: audits/signals_handler.py:108 #: audits/signals_handler.py:110
#, python-brace-format #, python-brace-format
msgid "{User} JOINED {UserGroup}" msgid "{User} JOINED {UserGroup}"
msgstr "{User} 加入 {UserGroup}" msgstr "{User} 加入 {UserGroup}"
#: audits/signals_handler.py:109 #: audits/signals_handler.py:111
#, python-brace-format #, python-brace-format
msgid "{User} LEFT {UserGroup}" msgid "{User} LEFT {UserGroup}"
msgstr "{User} 离开 {UserGroup}" msgstr "{User} 离开 {UserGroup}"
#: audits/signals_handler.py:112 #: audits/signals_handler.py:114
msgid "Asset and SystemUser" msgid "Asset and SystemUser"
msgstr "资产与系统用户" msgstr "资产与系统用户"
#: audits/signals_handler.py:113 #: audits/signals_handler.py:115
#, python-brace-format #, python-brace-format
msgid "{Asset} ADD {SystemUser}" msgid "{Asset} ADD {SystemUser}"
msgstr "{Asset} 添加 {SystemUser}" msgstr "{Asset} 添加 {SystemUser}"
#: audits/signals_handler.py:114 #: audits/signals_handler.py:116
#, python-brace-format #, python-brace-format
msgid "{Asset} REMOVE {SystemUser}" msgid "{Asset} REMOVE {SystemUser}"
msgstr "{Asset} 移除 {SystemUser}" msgstr "{Asset} 移除 {SystemUser}"
#: audits/signals_handler.py:117 #: audits/signals_handler.py:119
msgid "Node and Asset" msgid "Node and Asset"
msgstr "节点与资产" msgstr "节点与资产"
#: audits/signals_handler.py:118 #: audits/signals_handler.py:120
#, python-brace-format #, python-brace-format
msgid "{Node} ADD {Asset}" msgid "{Node} ADD {Asset}"
msgstr "{Node} 添加 {Asset}" msgstr "{Node} 添加 {Asset}"
#: audits/signals_handler.py:119 #: audits/signals_handler.py:121
#, python-brace-format #, python-brace-format
msgid "{Node} REMOVE {Asset}" msgid "{Node} REMOVE {Asset}"
msgstr "{Node} 移除 {Asset}" msgstr "{Node} 移除 {Asset}"
#: audits/signals_handler.py:122 #: audits/signals_handler.py:124
msgid "User asset permissions" msgid "User asset permissions"
msgstr "用户资产授权" msgstr "用户资产授权"
#: audits/signals_handler.py:123 #: audits/signals_handler.py:125
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} ADD {User}" msgid "{AssetPermission} ADD {User}"
msgstr "{AssetPermission} 添加 {User}" msgstr "{AssetPermission} 添加 {User}"
#: audits/signals_handler.py:124 #: audits/signals_handler.py:126
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} REMOVE {User}" msgid "{AssetPermission} REMOVE {User}"
msgstr "{AssetPermission} 移除 {User}" msgstr "{AssetPermission} 移除 {User}"
#: audits/signals_handler.py:127 #: audits/signals_handler.py:129
msgid "User group asset permissions" msgid "User group asset permissions"
msgstr "用户组资产授权" msgstr "用户组资产授权"
#: audits/signals_handler.py:128 #: audits/signals_handler.py:130
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} ADD {UserGroup}" msgid "{AssetPermission} ADD {UserGroup}"
msgstr "{AssetPermission} 添加 {UserGroup}" msgstr "{AssetPermission} 添加 {UserGroup}"
#: audits/signals_handler.py:129 #: audits/signals_handler.py:131
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} REMOVE {UserGroup}" msgid "{AssetPermission} REMOVE {UserGroup}"
msgstr "{AssetPermission} 移除 {UserGroup}" msgstr "{AssetPermission} 移除 {UserGroup}"
#: audits/signals_handler.py:132 perms/models/asset_permission.py:30 #: audits/signals_handler.py:134 perms/models/asset_permission.py:30
#: templates/_nav.html:78 users/templates/users/_user_detail_nav_header.html:31 #: templates/_nav.html:78 users/templates/users/_user_detail_nav_header.html:31
msgid "Asset permission" msgid "Asset permission"
msgstr "资产授权" msgstr "资产授权"
#: audits/signals_handler.py:133 #: audits/signals_handler.py:135
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} ADD {Asset}" msgid "{AssetPermission} ADD {Asset}"
msgstr "{AssetPermission} 添加 {Asset}" msgstr "{AssetPermission} 添加 {Asset}"
#: audits/signals_handler.py:134 #: audits/signals_handler.py:136
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} REMOVE {Asset}" msgid "{AssetPermission} REMOVE {Asset}"
msgstr "{AssetPermission} 移除 {Asset}" msgstr "{AssetPermission} 移除 {Asset}"
#: audits/signals_handler.py:137 #: audits/signals_handler.py:139
msgid "Node permission" msgid "Node permission"
msgstr "节点授权" msgstr "节点授权"
#: audits/signals_handler.py:138 #: audits/signals_handler.py:140
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} ADD {Node}" msgid "{AssetPermission} ADD {Node}"
msgstr "{AssetPermission} 添加 {Node}" msgstr "{AssetPermission} 添加 {Node}"
#: audits/signals_handler.py:139 #: audits/signals_handler.py:141
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} REMOVE {Node}" msgid "{AssetPermission} REMOVE {Node}"
msgstr "{AssetPermission} 移除 {Node}" msgstr "{AssetPermission} 移除 {Node}"
#: audits/signals_handler.py:142 #: audits/signals_handler.py:144
msgid "Asset permission and SystemUser" msgid "Asset permission and SystemUser"
msgstr "资产授权与系统用户" msgstr "资产授权与系统用户"
#: audits/signals_handler.py:143 #: audits/signals_handler.py:145
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} ADD {SystemUser}" msgid "{AssetPermission} ADD {SystemUser}"
msgstr "{AssetPermission} 添加 {SystemUser}" msgstr "{AssetPermission} 添加 {SystemUser}"
#: audits/signals_handler.py:144 #: audits/signals_handler.py:146
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} REMOVE {SystemUser}" msgid "{AssetPermission} REMOVE {SystemUser}"
msgstr "{AssetPermission} 移除 {SystemUser}" msgstr "{AssetPermission} 移除 {SystemUser}"
#: audits/signals_handler.py:147 #: audits/signals_handler.py:149
msgid "User application permissions" msgid "User application permissions"
msgstr "用户应用授权" msgstr "用户应用授权"
#: audits/signals_handler.py:148 #: audits/signals_handler.py:150
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} ADD {User}" msgid "{ApplicationPermission} ADD {User}"
msgstr "{ApplicationPermission} 添加 {User}" msgstr "{ApplicationPermission} 添加 {User}"
#: audits/signals_handler.py:149 #: audits/signals_handler.py:151
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} REMOVE {User}" msgid "{ApplicationPermission} REMOVE {User}"
msgstr "{ApplicationPermission} 移除 {User}" msgstr "{ApplicationPermission} 移除 {User}"
#: audits/signals_handler.py:152 #: audits/signals_handler.py:154
msgid "User group application permissions" msgid "User group application permissions"
msgstr "用户组应用授权" msgstr "用户组应用授权"
#: audits/signals_handler.py:153 #: audits/signals_handler.py:155
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} ADD {UserGroup}" msgid "{ApplicationPermission} ADD {UserGroup}"
msgstr "{ApplicationPermission} 添加 {UserGroup}" msgstr "{ApplicationPermission} 添加 {UserGroup}"
#: audits/signals_handler.py:154 #: audits/signals_handler.py:156
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} REMOVE {UserGroup}" msgid "{ApplicationPermission} REMOVE {UserGroup}"
msgstr "{ApplicationPermission} 移除 {UserGroup}" msgstr "{ApplicationPermission} 移除 {UserGroup}"
#: audits/signals_handler.py:157 perms/models/application_permission.py:37 #: audits/signals_handler.py:159 perms/models/application_permission.py:37
msgid "Application permission" msgid "Application permission"
msgstr "应用授权" msgstr "应用授权"
#: audits/signals_handler.py:158 #: audits/signals_handler.py:160
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} ADD {Application}" msgid "{ApplicationPermission} ADD {Application}"
msgstr "{ApplicationPermission} 添加 {Application}" msgstr "{ApplicationPermission} 添加 {Application}"
#: audits/signals_handler.py:159 #: audits/signals_handler.py:161
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} REMOVE {Application}" msgid "{ApplicationPermission} REMOVE {Application}"
msgstr "{ApplicationPermission} 移除 {Application}" msgstr "{ApplicationPermission} 移除 {Application}"
#: audits/signals_handler.py:162 #: audits/signals_handler.py:164
msgid "Application permission and SystemUser" msgid "Application permission and SystemUser"
msgstr "应用授权与系统用户" msgstr "应用授权与系统用户"
#: audits/signals_handler.py:163 #: audits/signals_handler.py:165
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} ADD {SystemUser}" msgid "{ApplicationPermission} ADD {SystemUser}"
msgstr "{ApplicationPermission} 添加 {SystemUser}" msgstr "{ApplicationPermission} 添加 {SystemUser}"
#: audits/signals_handler.py:164 #: audits/signals_handler.py:166
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} REMOVE {SystemUser}" msgid "{ApplicationPermission} REMOVE {SystemUser}"
msgstr "{ApplicationPermission} 移除 {SystemUser}" msgstr "{ApplicationPermission} 移除 {SystemUser}"
@ -6343,28 +6343,4 @@ msgstr "旗舰版"
#: xpack/plugins/license/models.py:77 #: xpack/plugins/license/models.py:77
msgid "Community edition" msgid "Community edition"
msgstr "社区版" msgstr "社区版"
#~ msgid "MFA type not support: {}"
#~ msgstr "MFA 类型不支持：{}"
#~ msgid "Push system users to asset: {}({}) => {}"
#~ msgstr "推送系统用户到入资产: {}({}) => {}"
#~ msgid "Test system user connectivity: {} => {}"
#~ msgstr "测试系统用户可连接性: {} => {}"
#~ msgid "Account backup plan execution"
#~ msgstr "改密计划执行"
#~ msgid "Account backup plan task"
#~ msgstr "改密计划任务"
#~ msgid "Escape route plan"
#~ msgstr "改密计划"
#~ msgid "Escape route execution"
#~ msgstr "改密计划执行"
#~ msgid "Escape route plan task"
#~ msgstr "改密计划任务"

2
apps/orgs/mixins/models.py
View File

@ -14,7 +14,7 @@ from ..models import Organization
logger = get_logger(__file__) logger = get_logger(__file__)
__all__ = [ __all__ = [
'OrgManager', 'OrgModelMixin', 'OrgManager', 'OrgModelMixin', 'Organization'
] ]