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

perf: 优化授权过期提醒 (#8654) 

Co-authored-by: feng626 <1304903146@qq.com>
pull/8657/head
fit2bot 2022-07-25 14:02:07 +08:00 committed by GitHub
parent dc32224294
commit c4146744e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92c63243fd3c83321311ffa44fbd91d619969ce18221b629de6e14db90b3a0e8
size 128842
oid sha256:7ff3ae18c27279b8783eba9e85b270f9c3da63f812da315ba210877b33b960a8
size 128908

26
apps/locale/ja/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-22 14:49+0800\n"
"POT-Creation-Date: 2022-07-25 13:53+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -304,7 +304,7 @@ msgstr "アプリケーションアカウントの秘密を変更できます"
#: applications/serializers/application.py:99 assets/models/label.py:21
#: perms/models/application_permission.py:21
#: perms/serializers/application/user_permission.py:33
#: tickets/models/ticket/apply_application.py:14
#: tickets/models/ticket/apply_application.py:15
#: xpack/plugins/change_auth_plan/models/app.py:25
msgid "Category"
msgstr "カテゴリ"
@ -316,7 +316,7 @@ msgstr "カテゴリ"
#: perms/serializers/application/user_permission.py:34
#: terminal/models/storage.py:58 terminal/models/storage.py:143
#: tickets/models/comment.py:26 tickets/models/flow.py:57
#: tickets/models/ticket/apply_application.py:17
#: tickets/models/ticket/apply_application.py:18
#: tickets/models/ticket/general.py:273
#: xpack/plugins/change_auth_plan/models/app.py:28
#: xpack/plugins/change_auth_plan/models/app.py:153
@ -425,7 +425,7 @@ msgstr "アプリケーションパス"
#: applications/serializers/attrs/application_category/remote_app.py:44
#: assets/serializers/system_user.py:167
#: tickets/serializers/ticket/apply_application.py:35
#: tickets/serializers/ticket/apply_application.py:38
#: tickets/serializers/ticket/common.py:59
#: xpack/plugins/change_auth_plan/serializers/asset.py:67
#: xpack/plugins/change_auth_plan/serializers/asset.py:70
@ -711,7 +711,7 @@ msgstr "タイミングトリガー"
#: assets/models/backup.py:105 audits/models.py:44 ops/models/command.py:31
#: perms/models/base.py:89 terminal/models/session.py:58
#: tickets/models/ticket/apply_application.py:25
#: tickets/models/ticket/apply_application.py:29
#: tickets/models/ticket/apply_asset.py:23
#: xpack/plugins/change_auth_plan/models/base.py:112
#: xpack/plugins/change_auth_plan/models/base.py:203
@ -1141,6 +1141,7 @@ msgstr "CPU情報"
#: perms/serializers/application/permission.py:42
#: perms/serializers/asset/permission.py:18
#: perms/serializers/asset/permission.py:46
#: tickets/models/ticket/apply_application.py:27
#: tickets/models/ticket/apply_asset.py:21
msgid "Actions"
msgstr "アクション"
@ -2144,7 +2145,7 @@ msgid "Secret"
msgstr "ひみつ"
#: authentication/models.py:74 authentication/models.py:264
#: perms/models/base.py:90 tickets/models/ticket/apply_application.py:26
#: perms/models/base.py:90 tickets/models/ticket/apply_application.py:30
#: tickets/models/ticket/apply_asset.py:24 users/models/user.py:703
msgid "Date expired"
msgstr "期限切れの日付"
@ -3136,6 +3137,11 @@ msgstr "クリップボードコピーペースト"
msgid "From ticket"
msgstr "チケットから"
#: perms/notifications.py:12 perms/notifications.py:44
#: perms/notifications.py:88 perms/notifications.py:119
msgid "today"
msgstr "今"
#: perms/notifications.py:15
msgid "You permed assets is about to expire"
msgstr "パーマ資産の有効期限が近づいています"
@ -5283,7 +5289,7 @@ msgstr "カスタムユーザー"
msgid "Ticket already closed"
msgstr "チケットはすでに閉じています"
#: tickets/handlers/apply_application.py:37
#: tickets/handlers/apply_application.py:38
msgid ""
"Created by the ticket, ticket title: {}, ticket applicant: {}, ticket "
"processor: {}, ticket ID: {}"
@ -5369,16 +5375,16 @@ msgstr "チケットの流れ"
msgid "Ticket session relation"
msgstr "チケットセッションの関係"
#: tickets/models/ticket/apply_application.py:11
#: tickets/models/ticket/apply_application.py:12
#: tickets/models/ticket/apply_asset.py:13
msgid "Permission name"
msgstr "認可ルール名"
#: tickets/models/ticket/apply_application.py:20
#: tickets/models/ticket/apply_application.py:21
msgid "Apply applications"
msgstr "アプリケーションの適用"
#: tickets/models/ticket/apply_application.py:23
#: tickets/models/ticket/apply_application.py:24
#: tickets/models/ticket/apply_asset.py:18
msgid "Apply system users"
msgstr "システムユーザーの適用"

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c4c49c98910aa6e85894d1ba57217932e4e960de325785003749f32000d62657
size 106197
oid sha256:493d944976b6e1ad0daba8bae18bd0823aaab4a72b63916315601fd59e984a5a
size 106223

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

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-22 14:49+0800\n"
"POT-Creation-Date: 2022-07-25 13:53+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n"
@ -299,7 +299,7 @@ msgstr "可以查看应用账号密码"
#: applications/serializers/application.py:99 assets/models/label.py:21
#: perms/models/application_permission.py:21
#: perms/serializers/application/user_permission.py:33
#: tickets/models/ticket/apply_application.py:14
#: tickets/models/ticket/apply_application.py:15
#: xpack/plugins/change_auth_plan/models/app.py:25
msgid "Category"
msgstr "类别"
@ -311,7 +311,7 @@ msgstr "类别"
#: perms/serializers/application/user_permission.py:34
#: terminal/models/storage.py:58 terminal/models/storage.py:143
#: tickets/models/comment.py:26 tickets/models/flow.py:57
#: tickets/models/ticket/apply_application.py:17
#: tickets/models/ticket/apply_application.py:18
#: tickets/models/ticket/general.py:273
#: xpack/plugins/change_auth_plan/models/app.py:28
#: xpack/plugins/change_auth_plan/models/app.py:153
@ -420,7 +420,7 @@ msgstr "应用路径"
#: applications/serializers/attrs/application_category/remote_app.py:44
#: assets/serializers/system_user.py:167
#: tickets/serializers/ticket/apply_application.py:35
#: tickets/serializers/ticket/apply_application.py:38
#: tickets/serializers/ticket/common.py:59
#: xpack/plugins/change_auth_plan/serializers/asset.py:67
#: xpack/plugins/change_auth_plan/serializers/asset.py:70
@ -706,7 +706,7 @@ msgstr "定时触发"
#: assets/models/backup.py:105 audits/models.py:44 ops/models/command.py:31
#: perms/models/base.py:89 terminal/models/session.py:58
#: tickets/models/ticket/apply_application.py:25
#: tickets/models/ticket/apply_application.py:29
#: tickets/models/ticket/apply_asset.py:23
#: xpack/plugins/change_auth_plan/models/base.py:112
#: xpack/plugins/change_auth_plan/models/base.py:203
@ -1133,6 +1133,7 @@ msgstr "CPU信息"
#: perms/serializers/application/permission.py:42
#: perms/serializers/asset/permission.py:18
#: perms/serializers/asset/permission.py:46
#: tickets/models/ticket/apply_application.py:27
#: tickets/models/ticket/apply_asset.py:21
msgid "Actions"
msgstr "动作"
@ -2123,7 +2124,7 @@ msgid "Secret"
msgstr "密钥"
#: authentication/models.py:74 authentication/models.py:264
#: perms/models/base.py:90 tickets/models/ticket/apply_application.py:26
#: perms/models/base.py:90 tickets/models/ticket/apply_application.py:30
#: tickets/models/ticket/apply_asset.py:24 users/models/user.py:703
msgid "Date expired"
msgstr "失效日期"
@ -3096,6 +3097,11 @@ msgstr "剪贴板复制粘贴"
msgid "From ticket"
msgstr "来自工单"
#: perms/notifications.py:12 perms/notifications.py:44
#: perms/notifications.py:88 perms/notifications.py:119
msgid "today"
msgstr "今"
#: perms/notifications.py:15
msgid "You permed assets is about to expire"
msgstr "你授权的资产即将到期"
@ -5205,7 +5211,7 @@ msgstr "自定义用户"
msgid "Ticket already closed"
msgstr "工单已经关闭"
#: tickets/handlers/apply_application.py:37
#: tickets/handlers/apply_application.py:38
msgid ""
"Created by the ticket, ticket title: {}, ticket applicant: {}, ticket "
"processor: {}, ticket ID: {}"
@ -5289,16 +5295,16 @@ msgstr "工单流程"
msgid "Ticket session relation"
msgstr "工单会话"
#: tickets/models/ticket/apply_application.py:11
#: tickets/models/ticket/apply_application.py:12
#: tickets/models/ticket/apply_asset.py:13
msgid "Permission name"
msgstr "授权规则名称"
#: tickets/models/ticket/apply_application.py:20
#: tickets/models/ticket/apply_application.py:21
msgid "Apply applications"
msgstr "申请应用"
#: tickets/models/ticket/apply_application.py:23
#: tickets/models/ticket/apply_application.py:24
#: tickets/models/ticket/apply_asset.py:18
msgid "Apply system users"
msgstr "申请的系统用户"

14
apps/perms/notifications.py
View File

@ -9,7 +9,7 @@ class PermedAssetsWillExpireUserMsg(UserMessage):
def __init__(self, user, assets, day_count=0):
super().__init__(user)
self.assets = assets
self.day_count = day_count
self.day_count = _('today') if day_count == 0 else day_count
def get_html_msg(self) -> dict:
subject = _("You permed assets is about to expire")
@ -41,7 +41,7 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage):
super().__init__(user)
self.perms = perms
self.org = org
self.day_count = day_count
self.day_count = _('today') if day_count == 0 else day_count
def get_items_with_url(self):
items_with_url = []
@ -59,7 +59,7 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage):
subject = _("Asset permissions is about to expire")
context = {
'name': self.user.name,
'count': self.day_count,
'count': str(self.day_count),
'items_with_url': items_with_url,
'item_type': _('asset permissions of organization {}').format(self.org)
}
@ -85,13 +85,13 @@ class PermedAppsWillExpireUserMsg(UserMessage):
def __init__(self, user, apps, day_count=0):
super().__init__(user)
self.apps = apps
self.day_count = day_count
self.day_count = _('today') if day_count == 0 else day_count
def get_html_msg(self) -> dict:
subject = _("Your permed applications is about to expire")
context = {
'name': self.user.name,
'count': self.day_count,
'count': str(self.day_count),
'item_type': _('permed applications'),
'items': [str(app) for app in self.apps]
}
@ -116,7 +116,7 @@ class AppPermsWillExpireForOrgAdminMsg(UserMessage):
super().__init__(user)
self.perms = perms
self.org = org
self.day_count = day_count
self.day_count = _('today') if day_count == 0 else day_count
def get_items_with_url(self):
items_with_url = []
@ -134,7 +134,7 @@ class AppPermsWillExpireForOrgAdminMsg(UserMessage):
subject = _('Application permissions is about to expire')
context = {
'name': self.user.name,
'count': self.day_count,
'count': str(self.day_count),
'item_type': _('application permissions of organization {}').format(self.org),
'items_with_url': items
}