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

perf(auth): 密码过期后，走重置密码流程 #530

pull/5207/head
xinwen 2020-12-09 18:17:10 +08:00 committed by 老广
parent 7c7de96158
commit 79a371eb6c
6 changed files with 202 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/authentication/errors.py
View File

@ -218,5 +218,14 @@ class PasswdTooSimple(JMSException):
default_detail = _('Your password is too simple, please change it for security') default_detail = _('Your password is too simple, please change it for security')
def __init__(self, url, *args, **kwargs): def __init__(self, url, *args, **kwargs):
super(PasswdTooSimple, self).__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.url = url
class PasswordRequireResetError(JMSException):
default_code = 'passwd_has_expired'
default_detail = _('Your password has expired, please reset before logging in')
def __init__(self, url, *args, **kwargs):
super().__init__(*args, **kwargs)
self.url = url self.url = url

41
apps/authentication/mixins.py
View File

@ -110,9 +110,8 @@ class AuthMixin:
raise CredentialError(error=errors.reason_user_inactive) raise CredentialError(error=errors.reason_user_inactive)
elif not user.is_active: elif not user.is_active:
raise CredentialError(error=errors.reason_user_inactive) raise CredentialError(error=errors.reason_user_inactive)
elif user.password_has_expired:
raise CredentialError(error=errors.reason_password_expired)
self._check_password_require_reset_or_not(user)
self._check_passwd_is_too_simple(user, password) self._check_passwd_is_too_simple(user, password)
clean_failed_count(username, ip) clean_failed_count(username, ip)
@ -123,20 +122,34 @@ class AuthMixin:
return user return user
@classmethod @classmethod
def _check_passwd_is_too_simple(cls, user, password): def generate_reset_password_url_with_flash_msg(cls, user: User, flash_view_name):
reset_passwd_url = reverse('authentication:reset-password')
query_str = urlencode({
'token': user.generate_reset_token()
})
reset_passwd_url = f'{reset_passwd_url}?{query_str}'
flash_page_url = reverse(flash_view_name)
query_str = urlencode({
'redirect_url': reset_passwd_url
})
return f'{flash_page_url}?{query_str}'
@classmethod
def _check_passwd_is_too_simple(cls, user: User, password):
if user.is_superuser and password == 'admin': if user.is_superuser and password == 'admin':
reset_passwd_url = reverse('authentication:reset-password') url = cls.generate_reset_password_url_with_flash_msg(
query_str = urlencode({ user, 'authentication:passwd-too-simple-flash-msg'
'token': user.generate_reset_token() )
}) raise errors.PasswdTooSimple(url)
reset_passwd_url = f'{reset_passwd_url}?{query_str}'
flash_page_url = reverse('authentication:passwd-too-simple-flash-msg') @classmethod
query_str = urlencode({ def _check_password_require_reset_or_not(cls, user: User):
'redirect_url': reset_passwd_url if user.password_has_expired:
}) url = cls.generate_reset_password_url_with_flash_msg(
user, 'authentication:passwd-has-expired-flash-msg'
raise errors.PasswdTooSimple(f'{flash_page_url}?{query_str}') )
raise errors.PasswordRequireResetError(url)
def check_user_auth_if_need(self, decrypt_passwd=False): def check_user_auth_if_need(self, decrypt_passwd=False):
request = self.request request = self.request

1
apps/authentication/urls/view_urls.py
View File

@ -22,6 +22,7 @@ urlpatterns = [
name='forgot-password-sendmail-success'), name='forgot-password-sendmail-success'),
path('password/reset/', users_view.UserResetPasswordView.as_view(), name='reset-password'), path('password/reset/', users_view.UserResetPasswordView.as_view(), name='reset-password'),
path('password/too-simple-flash-msg/', views.FlashPasswdTooSimpleMsgView.as_view(), name='passwd-too-simple-flash-msg'), path('password/too-simple-flash-msg/', views.FlashPasswdTooSimpleMsgView.as_view(), name='passwd-too-simple-flash-msg'),
path('password/has-expired-msg/', views.FlashPasswdHasExpiredMsgView.as_view(), name='passwd-has-expired-flash-msg'),
path('password/reset/success/', users_view.UserResetPasswordSuccessView.as_view(), name='reset-password-success'), path('password/reset/success/', users_view.UserResetPasswordSuccessView.as_view(), name='reset-password-success'),
path('password/verify/', users_view.UserVerifyPasswordView.as_view(), name='user-verify-password'), path('password/verify/', users_view.UserVerifyPasswordView.as_view(), name='user-verify-password'),

19
apps/authentication/views/login.py
View File

@ -32,7 +32,7 @@ from ..forms import get_user_login_form_cls
__all__ = [ __all__ = [
'UserLoginView', 'UserLogoutView', 'UserLoginView', 'UserLogoutView',
'UserLoginGuardView', 'UserLoginWaitConfirmView', 'UserLoginGuardView', 'UserLoginWaitConfirmView',
'FlashPasswdTooSimpleMsgView', 'FlashPasswdTooSimpleMsgView', 'FlashPasswdHasExpiredMsgView'
] ]
@ -96,7 +96,7 @@ class UserLoginView(mixins.AuthMixin, FormView):
new_form._errors = form.errors new_form._errors = form.errors
context = self.get_context_data(form=new_form) context = self.get_context_data(form=new_form)
return self.render_to_response(context) return self.render_to_response(context)
except errors.PasswdTooSimple as e: except (errors.PasswdTooSimple, errors.PasswordRequireResetError) as e:
return redirect(e.url) return redirect(e.url)
self.clear_rsa_key() self.clear_rsa_key()
return self.redirect_to_guard_view() return self.redirect_to_guard_view()
@ -250,3 +250,18 @@ class FlashPasswdTooSimpleMsgView(TemplateView):
'auto_redirect': True, 'auto_redirect': True,
} }
return self.render_to_response(context) return self.render_to_response(context)
@method_decorator(never_cache, name='dispatch')
class FlashPasswdHasExpiredMsgView(TemplateView):
template_name = 'flash_message_standalone.html'
def get(self, request, *args, **kwargs):
context = {
'title': _('Please change your password'),
'messages': _('Your password has expired, please reset before logging in'),
'interval': 5,
'redirect_url': request.GET.get('redirect_url'),
'auto_redirect': True,
}
return self.render_to_response(context)

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

Binary file not shown.

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

@ -8,7 +8,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: 2020-11-17 17:24+0800\n" "POT-Creation-Date: 2020-12-09 18:14+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\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"
@ -17,22 +17,22 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: applications/const.py:53 applications/models/application.py:34 #: applications/const.py:53 applications/models/application.py:33
msgid "Custom" msgid "Custom"
msgstr "自定义" msgstr "自定义"
#: applications/models/application.py:61 applications/models/database_app.py:29 #: applications/models/application.py:60 applications/models/database_app.py:29
#: applications/serializers/database_app.py:16 #: applications/serializers/database_app.py:16
#: applications/serializers/remote_app.py:69 #: applications/serializers/remote_app.py:69
#: users/templates/users/user_granted_database_app.html:37 #: users/templates/users/user_granted_database_app.html:37
msgid "Database" msgid "Database"
msgstr "数据库" msgstr "数据库"
#: applications/models/application.py:62 #: applications/models/application.py:61
msgid "Remote app" msgid "Remote app"
msgstr "远程应用" msgstr "远程应用"
#: applications/models/application.py:122 #: applications/models/application.py:121
#: applications/models/database_app.py:18 applications/models/k8s_app.py:11 #: applications/models/database_app.py:18 applications/models/k8s_app.py:11
#: applications/models/remote_app.py:21 assets/models/asset.py:149 #: applications/models/remote_app.py:21 assets/models/asset.py:149
#: assets/models/base.py:234 assets/models/cluster.py:18 #: assets/models/base.py:234 assets/models/cluster.py:18
@ -41,7 +41,7 @@ msgstr "远程应用"
#: orgs/models.py:23 perms/models/base.py:48 settings/models.py:27 #: orgs/models.py:23 perms/models/base.py:48 settings/models.py:27
#: terminal/models.py:28 terminal/models.py:372 terminal/models.py:404 #: terminal/models.py:28 terminal/models.py:372 terminal/models.py:404
#: terminal/models.py:441 users/forms/profile.py:20 users/models/group.py:15 #: terminal/models.py:441 users/forms/profile.py:20 users/models/group.py:15
#: users/models/user.py:505 users/templates/users/_select_user_modal.html:13 #: users/models/user.py:501 users/templates/users/_select_user_modal.html:13
#: users/templates/users/user_asset_permission.html:37 #: users/templates/users/user_asset_permission.html:37
#: users/templates/users/user_asset_permission.html:154 #: users/templates/users/user_asset_permission.html:154
#: users/templates/users/user_database_app_permission.html:36 #: users/templates/users/user_database_app_permission.html:36
@ -58,12 +58,12 @@ msgstr "远程应用"
msgid "Name" msgid "Name"
msgstr "名称" msgstr "名称"
#: applications/models/application.py:123 assets/models/asset.py:198 #: applications/models/application.py:122 assets/models/asset.py:198
#: assets/models/domain.py:27 assets/models/domain.py:54 #: assets/models/domain.py:27 assets/models/domain.py:54
msgid "Domain" msgid "Domain"
msgstr "网域" msgstr "网域"
#: applications/models/application.py:124 #: applications/models/application.py:123
#: applications/serializers/application.py:16 assets/models/label.py:21 #: applications/serializers/application.py:16 assets/models/label.py:21
#: perms/models/application_permission.py:19 #: perms/models/application_permission.py:19
#: perms/serializers/application/permission.py:16 #: perms/serializers/application/permission.py:16
@ -71,7 +71,7 @@ msgstr "网域"
msgid "Category" msgid "Category"
msgstr "分类" msgstr "分类"
#: applications/models/application.py:125 #: applications/models/application.py:124
#: applications/models/database_app.py:22 applications/models/k8s_app.py:14 #: applications/models/database_app.py:22 applications/models/k8s_app.py:14
#: applications/serializers/application.py:17 assets/models/cmd_filter.py:52 #: applications/serializers/application.py:17 assets/models/cmd_filter.py:52
#: perms/models/application_permission.py:20 #: perms/models/application_permission.py:20
@ -84,7 +84,7 @@ msgstr "类型"
# msgid "Date created" # msgid "Date created"
# msgstr "创建日期" # msgstr "创建日期"
#: applications/models/application.py:128 #: applications/models/application.py:127
#: applications/models/database_app.py:33 applications/models/k8s_app.py:18 #: applications/models/database_app.py:33 applications/models/k8s_app.py:18
#: applications/models/remote_app.py:45 assets/models/asset.py:154 #: applications/models/remote_app.py:45 assets/models/asset.py:154
#: assets/models/asset.py:230 assets/models/base.py:239 #: assets/models/asset.py:230 assets/models/base.py:239
@ -94,15 +94,15 @@ msgstr "类型"
#: assets/models/label.py:23 ops/models/adhoc.py:37 orgs/models.py:26 #: assets/models/label.py:23 ops/models/adhoc.py:37 orgs/models.py:26
#: perms/models/base.py:56 settings/models.py:32 terminal/models.py:38 #: perms/models/base.py:56 settings/models.py:32 terminal/models.py:38
#: terminal/models.py:411 terminal/models.py:448 tickets/models/ticket.py:43 #: terminal/models.py:411 terminal/models.py:448 tickets/models/ticket.py:43
#: users/models/group.py:16 users/models/user.py:538 #: users/models/group.py:16 users/models/user.py:534
#: users/templates/users/user_detail.html:115 #: users/templates/users/user_detail.html:115
#: users/templates/users/user_granted_database_app.html:38 #: users/templates/users/user_granted_database_app.html:38
#: users/templates/users/user_granted_remote_app.html:37 #: users/templates/users/user_granted_remote_app.html:37
#: users/templates/users/user_group_detail.html:62 #: users/templates/users/user_group_detail.html:62
#: users/templates/users/user_group_list.html:16 #: users/templates/users/user_group_list.html:16
#: users/templates/users/user_profile.html:138 #: users/templates/users/user_profile.html:138
#: xpack/plugins/change_auth_plan/models.py:77 xpack/plugins/cloud/models.py:54 #: xpack/plugins/change_auth_plan/models.py:77 xpack/plugins/cloud/models.py:55
#: xpack/plugins/cloud/models.py:149 xpack/plugins/gathered_user/models.py:26 #: xpack/plugins/cloud/models.py:150 xpack/plugins/gathered_user/models.py:26
msgid "Comment" msgid "Comment"
msgstr "备注" msgstr "备注"
@ -114,9 +114,9 @@ msgstr "主机"
#: applications/models/database_app.py:27 #: applications/models/database_app.py:27
#: applications/serializers/database_app.py:14 #: applications/serializers/database_app.py:14
#: applications/serializers/database_app.py:21 #: applications/serializers/database_app.py:20
#: applications/serializers/database_app.py:25 #: applications/serializers/database_app.py:24
#: applications/serializers/database_app.py:29 #: applications/serializers/database_app.py:28
#: applications/serializers/remote_app.py:68 assets/models/asset.py:195 #: applications/serializers/remote_app.py:68 assets/models/asset.py:195
#: assets/models/domain.py:52 #: assets/models/domain.py:52
msgid "Port" msgid "Port"
@ -159,7 +159,7 @@ msgstr "Kubernetes应用"
#: users/templates/users/user_asset_permission.html:70 #: users/templates/users/user_asset_permission.html:70
#: users/templates/users/user_granted_remote_app.html:36 #: users/templates/users/user_granted_remote_app.html:36
#: xpack/plugins/change_auth_plan/models.py:282 #: xpack/plugins/change_auth_plan/models.py:282
#: xpack/plugins/cloud/models.py:278 #: xpack/plugins/cloud/models.py:279
msgid "Asset" msgid "Asset"
msgstr "资产" msgstr "资产"
@ -182,10 +182,10 @@ msgstr "参数"
#: assets/models/cmd_filter.py:26 assets/models/cmd_filter.py:60 #: assets/models/cmd_filter.py:26 assets/models/cmd_filter.py:60
#: assets/models/group.py:21 common/db/models.py:67 common/mixins/models.py:49 #: assets/models/group.py:21 common/db/models.py:67 common/mixins/models.py:49
#: orgs/models.py:24 orgs/models.py:400 perms/models/base.py:54 #: orgs/models.py:24 orgs/models.py:400 perms/models/base.py:54
#: users/models/user.py:546 users/serializers/group.py:35 #: users/models/user.py:542 users/serializers/group.py:35
#: users/templates/users/user_detail.html:97 #: users/templates/users/user_detail.html:97
#: xpack/plugins/change_auth_plan/models.py:81 xpack/plugins/cloud/models.py:57 #: xpack/plugins/change_auth_plan/models.py:81 xpack/plugins/cloud/models.py:58
#: xpack/plugins/cloud/models.py:155 xpack/plugins/gathered_user/models.py:30 #: xpack/plugins/cloud/models.py:156 xpack/plugins/gathered_user/models.py:30
msgid "Created by" msgid "Created by"
msgstr "创建者" msgstr "创建者"
@ -198,7 +198,7 @@ msgstr "创建者"
#: common/mixins/models.py:50 ops/models/adhoc.py:38 ops/models/command.py:27 #: common/mixins/models.py:50 ops/models/adhoc.py:38 ops/models/command.py:27
#: orgs/models.py:25 orgs/models.py:398 perms/models/base.py:55 #: orgs/models.py:25 orgs/models.py:398 perms/models/base.py:55
#: users/models/group.py:18 users/templates/users/user_group_detail.html:58 #: users/models/group.py:18 users/templates/users/user_group_detail.html:58
#: xpack/plugins/cloud/models.py:60 xpack/plugins/cloud/models.py:158 #: xpack/plugins/cloud/models.py:61 xpack/plugins/cloud/models.py:159
msgid "Date created" msgid "Date created"
msgstr "创建日期" msgstr "创建日期"
@ -211,7 +211,7 @@ msgstr "创建日期"
msgid "RemoteApp" msgid "RemoteApp"
msgstr "远程应用" msgstr "远程应用"
#: applications/serializers/database_app.py:50 #: applications/serializers/database_app.py:49
#: applications/serializers/k8s_app.py:17 #: applications/serializers/k8s_app.py:17
#: applications/serializers/remote_app.py:162 audits/serializers.py:26 #: applications/serializers/remote_app.py:162 audits/serializers.py:26
msgid "Type for display" msgid "Type for display"
@ -237,7 +237,7 @@ msgstr "目标URL"
#: authentication/forms.py:11 #: authentication/forms.py:11
#: authentication/templates/authentication/login.html:21 #: authentication/templates/authentication/login.html:21
#: authentication/templates/authentication/xpack_login.html:101 #: authentication/templates/authentication/xpack_login.html:101
#: ops/models/adhoc.py:148 users/forms/profile.py:19 users/models/user.py:503 #: ops/models/adhoc.py:148 users/forms/profile.py:19 users/models/user.py:499
#: users/templates/users/_select_user_modal.html:14 #: users/templates/users/_select_user_modal.html:14
#: users/templates/users/user_detail.html:53 #: users/templates/users/user_detail.html:53
#: users/templates/users/user_list.html:15 #: users/templates/users/user_list.html:15
@ -300,6 +300,10 @@ msgid "You can't update the root node name"
msgstr "不能修改根节点名称" msgstr "不能修改根节点名称"
#: assets/api/node.py:65 #: assets/api/node.py:65
msgid "You can't delete the root node ({})"
msgstr "不能删除根节点 ({})"
#: assets/api/node.py:68
msgid "Deletion failed and the node contains children or assets" msgid "Deletion failed and the node contains children or assets"
msgstr "删除失败，节点包含子节点或资产" msgstr "删除失败，节点包含子节点或资产"
@ -334,7 +338,7 @@ msgstr "系统平台"
#: assets/models/asset.py:191 assets/serializers/asset_user.py:45 #: assets/models/asset.py:191 assets/serializers/asset_user.py:45
#: assets/serializers/gathered_user.py:20 settings/serializers/settings.py:51 #: assets/serializers/gathered_user.py:20 settings/serializers/settings.py:51
#: tickets/api/request_asset_perm.py:63 #: tickets/api/request_asset_perm.py:67
#: tickets/serializers/request_asset_perm.py:25 #: tickets/serializers/request_asset_perm.py:25
#: users/templates/users/_granted_assets.html:25 #: users/templates/users/_granted_assets.html:25
#: users/templates/users/user_asset_permission.html:157 #: users/templates/users/user_asset_permission.html:157
@ -366,7 +370,7 @@ msgstr "激活"
#: assets/models/asset.py:203 assets/models/cluster.py:19 #: assets/models/asset.py:203 assets/models/cluster.py:19
#: assets/models/user.py:66 templates/_nav.html:44 #: assets/models/user.py:66 templates/_nav.html:44
#: xpack/plugins/cloud/models.py:142 xpack/plugins/cloud/serializers.py:84 #: xpack/plugins/cloud/models.py:143 xpack/plugins/cloud/serializers.py:115
msgid "Admin user" msgid "Admin user"
msgstr "管理用户" msgstr "管理用户"
@ -480,7 +484,7 @@ msgstr "带宽"
msgid "Contact" msgid "Contact"
msgstr "联系人" msgstr "联系人"
#: assets/models/cluster.py:22 users/models/user.py:524 #: assets/models/cluster.py:22 users/models/user.py:520
#: users/templates/users/user_detail.html:62 #: users/templates/users/user_detail.html:62
msgid "Phone" msgid "Phone"
msgstr "手机" msgstr "手机"
@ -506,7 +510,7 @@ msgid "Default"
msgstr "默认" msgstr "默认"
#: assets/models/cluster.py:36 assets/models/label.py:14 #: assets/models/cluster.py:36 assets/models/label.py:14
#: users/models/user.py:665 #: users/models/user.py:661
msgid "System" msgid "System"
msgstr "系统" msgstr "系统"
@ -617,7 +621,7 @@ msgstr "默认资产组"
#: tickets/models/ticket.py:30 tickets/models/ticket.py:136 #: tickets/models/ticket.py:30 tickets/models/ticket.py:136
#: tickets/serializers/request_asset_perm.py:66 #: tickets/serializers/request_asset_perm.py:66
#: tickets/serializers/ticket.py:31 users/forms/group.py:15 #: tickets/serializers/ticket.py:31 users/forms/group.py:15
#: users/models/user.py:159 users/models/user.py:653 #: users/models/user.py:159 users/models/user.py:649
#: users/serializers/group.py:20 #: users/serializers/group.py:20
#: users/templates/users/user_asset_permission.html:38 #: users/templates/users/user_asset_permission.html:38
#: users/templates/users/user_asset_permission.html:64 #: users/templates/users/user_asset_permission.html:64
@ -631,7 +635,7 @@ msgstr "默认资产组"
msgid "User" msgid "User"
msgstr "用户" msgstr "用户"
#: assets/models/label.py:19 assets/models/node.py:398 settings/models.py:28 #: assets/models/label.py:19 assets/models/node.py:401 settings/models.py:28
msgid "Value" msgid "Value"
msgstr "值" msgstr "值"
@ -643,24 +647,24 @@ msgstr "新节点"
msgid "empty" msgid "empty"
msgstr "空" msgstr "空"
#: assets/models/node.py:397 perms/models/asset_permission.py:144 #: assets/models/node.py:400 perms/models/asset_permission.py:144
msgid "Key" msgid "Key"
msgstr "键" msgstr "键"
#: assets/models/node.py:399 #: assets/models/node.py:402
msgid "Full value" msgid "Full value"
msgstr "全称" msgstr "全称"
#: assets/models/node.py:402 perms/models/asset_permission.py:148 #: assets/models/node.py:405 perms/models/asset_permission.py:148
msgid "Parent key" msgid "Parent key"
msgstr "ssh私钥" msgstr "ssh私钥"
#: assets/models/node.py:411 assets/serializers/system_user.py:190 #: assets/models/node.py:414 assets/serializers/system_user.py:190
#: perms/forms/asset_permission.py:92 perms/forms/asset_permission.py:99 #: perms/forms/asset_permission.py:92 perms/forms/asset_permission.py:99
#: users/templates/users/user_asset_permission.html:41 #: users/templates/users/user_asset_permission.html:41
#: users/templates/users/user_asset_permission.html:73 #: users/templates/users/user_asset_permission.html:73
#: users/templates/users/user_asset_permission.html:158 #: users/templates/users/user_asset_permission.html:158
#: xpack/plugins/cloud/models.py:138 xpack/plugins/cloud/serializers.py:85 #: xpack/plugins/cloud/models.py:139 xpack/plugins/cloud/serializers.py:116
msgid "Node" msgid "Node"
msgstr "节点" msgstr "节点"
@ -732,7 +736,7 @@ msgstr "用户组"
#: perms/models/remote_app_permission.py:16 templates/_nav.html:45 #: perms/models/remote_app_permission.py:16 templates/_nav.html:45
#: terminal/backends/command/models.py:20 #: terminal/backends/command/models.py:20
#: terminal/backends/command/serializers.py:14 terminal/models.py:194 #: terminal/backends/command/serializers.py:14 terminal/models.py:194
#: tickets/api/request_asset_perm.py:64 #: tickets/api/request_asset_perm.py:68
#: tickets/serializers/request_asset_perm.py:27 #: tickets/serializers/request_asset_perm.py:27
#: users/templates/users/_granted_assets.html:27 #: users/templates/users/_granted_assets.html:27
#: users/templates/users/user_asset_permission.html:42 #: users/templates/users/user_asset_permission.html:42
@ -782,15 +786,15 @@ msgstr "管理用户名称"
msgid "Nodes name" msgid "Nodes name"
msgstr "节点名称" msgstr "节点名称"
#: assets/serializers/asset.py:110 #: assets/serializers/asset.py:107
msgid "Hardware info" msgid "Hardware info"
msgstr "硬件信息" msgstr "硬件信息"
#: assets/serializers/asset.py:111 orgs/mixins/serializers.py:26 #: assets/serializers/asset.py:108 orgs/mixins/serializers.py:26
msgid "Org name" msgid "Org name"
msgstr "组织名称" msgstr "组织名称"
#: assets/serializers/asset.py:165 assets/serializers/asset.py:196 #: assets/serializers/asset.py:162 assets/serializers/asset.py:193
msgid "Connectivity" msgid "Connectivity"
msgstr "连接" msgstr "连接"
@ -805,14 +809,14 @@ msgid "Backend"
msgstr "后端" msgstr "后端"
#: assets/serializers/asset_user.py:75 users/forms/profile.py:148 #: assets/serializers/asset_user.py:75 users/forms/profile.py:148
#: users/models/user.py:535 users/templates/users/user_password_update.html:48 #: users/models/user.py:531 users/templates/users/user_password_update.html:48
#: users/templates/users/user_profile.html:69 #: users/templates/users/user_profile.html:69
#: users/templates/users/user_profile_update.html:46 #: users/templates/users/user_profile_update.html:46
#: users/templates/users/user_pubkey_update.html:46 #: users/templates/users/user_pubkey_update.html:46
msgid "Public key" msgid "Public key"
msgstr "SSH公钥" msgstr "SSH公钥"
#: assets/serializers/asset_user.py:79 users/models/user.py:532 #: assets/serializers/asset_user.py:79 users/models/user.py:528
msgid "Private key" msgid "Private key"
msgstr "ssh私钥" msgstr "ssh私钥"
@ -937,20 +941,20 @@ msgstr "收集资产上的用户"
msgid "System user is dynamic: {}" msgid "System user is dynamic: {}"
msgstr "系统用户是动态的: {}" msgstr "系统用户是动态的: {}"
#: assets/tasks/push_system_user.py:215 #: assets/tasks/push_system_user.py:224
msgid "Start push system user for platform: [{}]" msgid "Start push system user for platform: [{}]"
msgstr "推送系统用户到平台: [{}]" msgstr "推送系统用户到平台: [{}]"
#: assets/tasks/push_system_user.py:216 #: assets/tasks/push_system_user.py:225
#: assets/tasks/system_user_connectivity.py:81 #: assets/tasks/system_user_connectivity.py:81
msgid "Hosts count: {}" msgid "Hosts count: {}"
msgstr "主机数量: {}" msgstr "主机数量: {}"
#: assets/tasks/push_system_user.py:235 assets/tasks/push_system_user.py:253 #: assets/tasks/push_system_user.py:264 assets/tasks/push_system_user.py:290
msgid "Push system users to assets: {}" msgid "Push system users to assets: {}"
msgstr "推送系统用户到入资产: {}" msgstr "推送系统用户到入资产: {}"
#: assets/tasks/push_system_user.py:243 #: assets/tasks/push_system_user.py:276
msgid "Push system users to asset: {}({}) => {}" msgid "Push system users to asset: {}({}) => {}"
msgstr "推送系统用户到入资产: {}({}) => {}" msgstr "推送系统用户到入资产: {}({}) => {}"
@ -1105,7 +1109,7 @@ msgstr "启用"
msgid "-" msgid "-"
msgstr "" msgstr ""
#: audits/models.py:96 xpack/plugins/cloud/models.py:213 #: audits/models.py:96 xpack/plugins/cloud/models.py:214
msgid "Failed" msgid "Failed"
msgstr "失败" msgstr "失败"
@ -1128,20 +1132,20 @@ msgstr "用户代理"
#: audits/models.py:104 #: audits/models.py:104
#: authentication/templates/authentication/_mfa_confirm_modal.html:14 #: authentication/templates/authentication/_mfa_confirm_modal.html:14
#: authentication/templates/authentication/login_otp.html:6 #: authentication/templates/authentication/login_otp.html:6
#: users/forms/profile.py:52 users/models/user.py:527 #: users/forms/profile.py:52 users/models/user.py:523
#: users/serializers/user.py:228 users/templates/users/user_detail.html:77 #: users/serializers/user.py:232 users/templates/users/user_detail.html:77
#: users/templates/users/user_profile.html:87 #: users/templates/users/user_profile.html:87
msgid "MFA" msgid "MFA"
msgstr "多因子认证" msgstr "多因子认证"
#: audits/models.py:105 xpack/plugins/change_auth_plan/models.py:303 #: audits/models.py:105 xpack/plugins/change_auth_plan/models.py:303
#: xpack/plugins/cloud/models.py:226 #: xpack/plugins/cloud/models.py:227
msgid "Reason" msgid "Reason"
msgstr "原因" msgstr "原因"
#: audits/models.py:106 tickets/serializers/request_asset_perm.py:64 #: audits/models.py:106 tickets/serializers/request_asset_perm.py:64
#: tickets/serializers/ticket.py:29 xpack/plugins/cloud/models.py:223 #: tickets/serializers/ticket.py:29 xpack/plugins/cloud/models.py:224
#: xpack/plugins/cloud/models.py:281 #: xpack/plugins/cloud/models.py:282
msgid "Status" msgid "Status"
msgstr "状态" msgstr "状态"
@ -1167,7 +1171,7 @@ msgid "Is success"
msgstr "是否成功" msgstr "是否成功"
#: audits/serializers.py:76 ops/models/command.py:24 #: audits/serializers.py:76 ops/models/command.py:24
#: xpack/plugins/cloud/models.py:221 #: xpack/plugins/cloud/models.py:222
msgid "Result" msgid "Result"
msgstr "结果" msgstr "结果"
@ -1327,6 +1331,10 @@ msgstr "SSO 认证关闭了"
msgid "Your password is too simple, please change it for security" msgid "Your password is too simple, please change it for security"
msgstr "你的密码过于简单，为了安全，请修改" msgstr "你的密码过于简单，为了安全，请修改"
#: authentication/errors.py:227 authentication/views/login.py:262
msgid "Your password has expired, please reset before logging in"
msgstr "您的密码已过期，请先修改再登录"
#: authentication/forms.py:26 authentication/forms.py:34 #: authentication/forms.py:26 authentication/forms.py:34
#: authentication/templates/authentication/login.html:39 #: authentication/templates/authentication/login.html:39
#: authentication/templates/authentication/xpack_login.html:119 #: authentication/templates/authentication/xpack_login.html:119
@ -1389,7 +1397,7 @@ msgid "Show"
msgstr "显示" msgstr "显示"
#: authentication/templates/authentication/_access_key_modal.html:66 #: authentication/templates/authentication/_access_key_modal.html:66
#: users/models/user.py:425 users/serializers/user.py:225 #: users/models/user.py:421 users/serializers/user.py:229
#: users/templates/users/user_profile.html:94 #: users/templates/users/user_profile.html:94
#: users/templates/users/user_profile.html:163 #: users/templates/users/user_profile.html:163
#: users/templates/users/user_profile.html:166 #: users/templates/users/user_profile.html:166
@ -1398,7 +1406,7 @@ msgid "Disable"
msgstr "禁用" msgstr "禁用"
#: authentication/templates/authentication/_access_key_modal.html:67 #: authentication/templates/authentication/_access_key_modal.html:67
#: users/models/user.py:426 users/serializers/user.py:226 #: users/models/user.py:422 users/serializers/user.py:230
#: users/templates/users/user_profile.html:92 #: users/templates/users/user_profile.html:92
#: users/templates/users/user_profile.html:170 #: users/templates/users/user_profile.html:170
msgid "Enable" msgid "Enable"
@ -1538,7 +1546,7 @@ msgstr "退出登录成功"
msgid "Logout success, return login page" msgid "Logout success, return login page"
msgstr "退出登录成功，返回到登录页面" msgstr "退出登录成功，返回到登录页面"
#: authentication/views/login.py:246 #: authentication/views/login.py:246 authentication/views/login.py:261
msgid "Please change your password" msgid "Please change your password"
msgstr "请修改密码" msgstr "请修改密码"
@ -1556,10 +1564,9 @@ msgstr "%(name)s 更新成功"
msgid "Updated by" msgid "Updated by"
msgstr "更新人" msgstr "更新人"
#: common/drf/parsers/csv.py:22 #: common/drf/parsers/base.py:16
#, python-format msgid "The file content overflowed (The maximum length `{}` bytes)"
msgid "The max size of CSV is %d bytes" msgstr ""
msgstr "CSV 文件最大为 %d 字节"
#: common/exceptions.py:15 #: common/exceptions.py:15
#, python-format #, python-format
@ -1838,7 +1845,7 @@ msgid "The current organization cannot be deleted"
msgstr "当前组织不能被删除" msgstr "当前组织不能被删除"
#: orgs/mixins/models.py:56 orgs/mixins/serializers.py:25 orgs/models.py:41 #: orgs/mixins/models.py:56 orgs/mixins/serializers.py:25 orgs/models.py:41
#: orgs/models.py:395 orgs/serializers.py:80 orgs/serializers.py:91 #: orgs/models.py:395 orgs/serializers.py:79
msgid "Organization" msgid "Organization"
msgstr "组织" msgstr "组织"
@ -1850,7 +1857,7 @@ msgstr "组织管理员"
msgid "Organization auditor" msgid "Organization auditor"
msgstr "组织审计员" msgstr "组织审计员"
#: orgs/models.py:397 users/forms/user.py:27 users/models/user.py:515 #: orgs/models.py:397 users/forms/user.py:27 users/models/user.py:511
#: users/templates/users/_select_user_modal.html:15 #: users/templates/users/_select_user_modal.html:15
#: users/templates/users/user_detail.html:73 #: users/templates/users/user_detail.html:73
#: users/templates/users/user_list.html:16 #: users/templates/users/user_list.html:16
@ -1883,7 +1890,7 @@ msgstr "提示：RDP 协议不支持单独控制上传或下载文件"
#: perms/forms/asset_permission.py:86 perms/forms/database_app_permission.py:41 #: perms/forms/asset_permission.py:86 perms/forms/database_app_permission.py:41
#: perms/forms/remote_app_permission.py:43 perms/models/base.py:50 #: perms/forms/remote_app_permission.py:43 perms/models/base.py:50
#: templates/_nav.html:21 users/forms/user.py:168 users/models/group.py:31 #: templates/_nav.html:21 users/forms/user.py:168 users/models/group.py:31
#: users/models/user.py:511 users/templates/users/_select_user_modal.html:16 #: users/models/user.py:507 users/templates/users/_select_user_modal.html:16
#: users/templates/users/user_asset_permission.html:39 #: users/templates/users/user_asset_permission.html:39
#: users/templates/users/user_asset_permission.html:67 #: users/templates/users/user_asset_permission.html:67
#: users/templates/users/user_database_app_permission.html:38 #: users/templates/users/user_database_app_permission.html:38
@ -1957,7 +1964,7 @@ msgid "Asset permission"
msgstr "资产授权" msgstr "资产授权"
#: perms/models/base.py:53 tickets/serializers/request_asset_perm.py:31 #: perms/models/base.py:53 tickets/serializers/request_asset_perm.py:31
#: users/models/user.py:543 users/templates/users/user_detail.html:93 #: users/models/user.py:539 users/templates/users/user_detail.html:93
#: users/templates/users/user_profile.html:120 #: users/templates/users/user_profile.html:120
msgid "Date expired" msgid "Date expired"
msgstr "失效日期" msgstr "失效日期"
@ -1982,7 +1989,7 @@ msgid ""
"permission type. ({})" "permission type. ({})"
msgstr "应用列表中包含与授权类型不同的应用。({})" msgstr "应用列表中包含与授权类型不同的应用。({})"
#: perms/serializers/asset/permission.py:58 users/serializers/user.py:76 #: perms/serializers/asset/permission.py:58 users/serializers/user.py:80
msgid "Is expired" msgid "Is expired"
msgstr "是否过期" msgstr "是否过期"
@ -1991,7 +1998,7 @@ msgstr "是否过期"
#: perms/serializers/database_app_permission.py:62 #: perms/serializers/database_app_permission.py:62
#: perms/serializers/k8s_app_permission.py:41 #: perms/serializers/k8s_app_permission.py:41
#: perms/serializers/k8s_app_permission.py:60 #: perms/serializers/k8s_app_permission.py:60
#: perms/serializers/remote_app_permission.py:36 users/serializers/user.py:75 #: perms/serializers/remote_app_permission.py:36 users/serializers/user.py:79
msgid "Is valid" msgid "Is valid"
msgstr "账户是否有效" msgstr "账户是否有效"
@ -2040,7 +2047,7 @@ msgstr "远程应用数量"
msgid "Favorite" msgid "Favorite"
msgstr "收藏夹" msgstr "收藏夹"
#: perms/utils/asset/user_permission.py:526 #: perms/utils/asset/user_permission.py:522
msgid "Please wait while your data is being initialized" msgid "Please wait while your data is being initialized"
msgstr "数据正在初始化，请稍等" msgstr "数据正在初始化，请稍等"
@ -2849,46 +2856,46 @@ msgstr ""
msgid "Ticket has %s" msgid "Ticket has %s"
msgstr "工单已%s" msgstr "工单已%s"
#: tickets/api/request_asset_perm.py:62 #: tickets/api/request_asset_perm.py:66
#: tickets/serializers/request_asset_perm.py:23 #: tickets/serializers/request_asset_perm.py:23
msgid "IP group" msgid "IP group"
msgstr "IP组" msgstr "IP组"
#: tickets/api/request_asset_perm.py:65 #: tickets/api/request_asset_perm.py:69
#: tickets/serializers/request_asset_perm.py:35 #: tickets/serializers/request_asset_perm.py:35
msgid "Confirmed assets" msgid "Confirmed assets"
msgstr "确认的资产" msgstr "确认的资产"
#: tickets/api/request_asset_perm.py:66 #: tickets/api/request_asset_perm.py:70
msgid "Confirmed system users" msgid "Confirmed system users"
msgstr "确认的系统用户" msgstr "确认的系统用户"
#: tickets/api/request_asset_perm.py:87 #: tickets/api/request_asset_perm.py:91
msgid "Confirm assets first" msgid "Confirm assets first"
msgstr "请先确认资产" msgstr "请先确认资产"
#: tickets/api/request_asset_perm.py:90 #: tickets/api/request_asset_perm.py:94
msgid "Confirmed assets changed" msgid "Confirmed assets changed"
msgstr "确认的资产变更了" msgstr "确认的资产变更了"
#: tickets/api/request_asset_perm.py:94 #: tickets/api/request_asset_perm.py:98
msgid "Confirm system-users first" msgid "Confirm system-users first"
msgstr "请先确认系统用户" msgstr "请先确认系统用户"
#: tickets/api/request_asset_perm.py:98 #: tickets/api/request_asset_perm.py:102
msgid "Confirmed system-users changed" msgid "Confirmed system-users changed"
msgstr "确认的系统用户变更了" msgstr "确认的系统用户变更了"
#: tickets/api/request_asset_perm.py:104 tickets/api/request_asset_perm.py:111 #: tickets/api/request_asset_perm.py:108 tickets/api/request_asset_perm.py:115
#: xpack/plugins/cloud/models.py:214 #: xpack/plugins/cloud/models.py:215
msgid "Succeed" msgid "Succeed"
msgstr "成功" msgstr "成功"
#: tickets/api/request_asset_perm.py:118 #: tickets/api/request_asset_perm.py:122
msgid "From request ticket: {} {}" msgid "From request ticket: {} {}"
msgstr "来自工单申请: {} {}" msgstr "来自工单申请: {} {}"
#: tickets/api/request_asset_perm.py:120 #: tickets/api/request_asset_perm.py:124
msgid "{} request assets, approved by {}" msgid "{} request assets, approved by {}"
msgstr "{} 申请资产，通过人 {}" msgstr "{} 申请资产，通过人 {}"
@ -3063,7 +3070,7 @@ msgstr ""
" </div>\n" " </div>\n"
" " " "
#: users/api/user.py:190 #: users/api/user.py:199
msgid "Could not reset self otp, use profile reset instead" msgid "Could not reset self otp, use profile reset instead"
msgstr "不能在该页面重置多因子认证, 请去个人信息页面重置" msgstr "不能在该页面重置多因子认证, 请去个人信息页面重置"
@ -3109,7 +3116,7 @@ msgstr "确认密码"
msgid "Password does not match" msgid "Password does not match"
msgstr "密码不一致" msgstr "密码不一致"
#: users/forms/profile.py:89 users/models/user.py:507 #: users/forms/profile.py:89 users/models/user.py:503
#: users/templates/users/user_detail.html:57 #: users/templates/users/user_detail.html:57
#: users/templates/users/user_profile.html:59 #: users/templates/users/user_profile.html:59
msgid "Email" msgid "Email"
@ -3145,12 +3152,12 @@ msgid "Public key should not be the same as your old one."
msgstr "不能和原来的密钥相同" msgstr "不能和原来的密钥相同"
#: users/forms/profile.py:137 users/forms/user.py:90 #: users/forms/profile.py:137 users/forms/user.py:90
#: users/serializers/user.py:188 users/serializers/user.py:270 #: users/serializers/user.py:192 users/serializers/user.py:274
#: users/serializers/user.py:328 #: users/serializers/user.py:332
msgid "Not a valid ssh public key" msgid "Not a valid ssh public key"
msgstr "SSH密钥不合法" msgstr "SSH密钥不合法"
#: users/forms/user.py:31 users/models/user.py:550 #: users/forms/user.py:31 users/models/user.py:546
#: users/templates/users/user_detail.html:89 #: users/templates/users/user_detail.html:89
#: users/templates/users/user_list.html:18 #: users/templates/users/user_list.html:18
#: users/templates/users/user_profile.html:102 #: users/templates/users/user_profile.html:102
@ -3192,31 +3199,31 @@ msgstr "系统管理员"
msgid "System auditor" msgid "System auditor"
msgstr "系统审计员" msgstr "系统审计员"
#: users/models/user.py:427 users/templates/users/user_profile.html:90 #: users/models/user.py:423 users/templates/users/user_profile.html:90
msgid "Force enable" msgid "Force enable"
msgstr "强制启用" msgstr "强制启用"
#: users/models/user.py:494 #: users/models/user.py:490
msgid "Local" msgid "Local"
msgstr "数据库" msgstr "数据库"
#: users/models/user.py:518 #: users/models/user.py:514
msgid "Avatar" msgid "Avatar"
msgstr "头像" msgstr "头像"
#: users/models/user.py:521 users/templates/users/user_detail.html:68 #: users/models/user.py:517 users/templates/users/user_detail.html:68
msgid "Wechat" msgid "Wechat"
msgstr "微信" msgstr "微信"
#: users/models/user.py:554 #: users/models/user.py:550
msgid "Date password last updated" msgid "Date password last updated"
msgstr "最后更新密码日期" msgstr "最后更新密码日期"
#: users/models/user.py:661 #: users/models/user.py:657
msgid "Administrator" msgid "Administrator"
msgstr "管理员" msgstr "管理员"
#: users/models/user.py:664 #: users/models/user.py:660
msgid "Administrator is the super user of system" msgid "Administrator is the super user of system"
msgstr "Administrator是初始的超级管理员" msgstr "Administrator是初始的超级管理员"
@ -3236,55 +3243,55 @@ msgstr "是否可更新"
msgid "Can delete" msgid "Can delete"
msgstr "是否可删除" msgstr "是否可删除"
#: users/serializers/user.py:49 users/serializers/user.py:81 #: users/serializers/user.py:49 users/serializers/user.py:85
msgid "Organization role name" msgid "Organization role name"
msgstr "组织角色名称" msgstr "组织角色名称"
#: users/serializers/user.py:74 users/serializers/user.py:241 #: users/serializers/user.py:78 users/serializers/user.py:245
msgid "Is first login" msgid "Is first login"
msgstr "首次登录" msgstr "首次登录"
#: users/serializers/user.py:77 #: users/serializers/user.py:81
msgid "Avatar url" msgid "Avatar url"
msgstr "头像路径" msgstr "头像路径"
#: users/serializers/user.py:79 #: users/serializers/user.py:83
msgid "Groups name" msgid "Groups name"
msgstr "用户组名" msgstr "用户组名"
#: users/serializers/user.py:80 #: users/serializers/user.py:84
msgid "Source name" msgid "Source name"
msgstr "用户来源名" msgstr "用户来源名"
#: users/serializers/user.py:82 #: users/serializers/user.py:86
msgid "Super role name" msgid "Super role name"
msgstr "超级角色名称" msgstr "超级角色名称"
#: users/serializers/user.py:83 #: users/serializers/user.py:87
msgid "Total role name" msgid "Total role name"
msgstr "汇总角色名称" msgstr "汇总角色名称"
#: users/serializers/user.py:84 #: users/serializers/user.py:88
msgid "MFA enabled" msgid "MFA enabled"
msgstr "是否开启多因子认证" msgstr "是否开启多因子认证"
#: users/serializers/user.py:85 #: users/serializers/user.py:89
msgid "MFA force enabled" msgid "MFA force enabled"
msgstr "强制启用多因子认证" msgstr "强制启用多因子认证"
#: users/serializers/user.py:108 #: users/serializers/user.py:112
msgid "Role limit to {}" msgid "Role limit to {}"
msgstr "角色只能为 {}" msgstr "角色只能为 {}"
#: users/serializers/user.py:120 users/serializers/user.py:294 #: users/serializers/user.py:124 users/serializers/user.py:298
msgid "Password does not match security rules" msgid "Password does not match security rules"
msgstr "密码不满足安全规则" msgstr "密码不满足安全规则"
#: users/serializers/user.py:286 #: users/serializers/user.py:290
msgid "The old password is incorrect" msgid "The old password is incorrect"
msgstr "旧密码错误" msgstr "旧密码错误"
#: users/serializers/user.py:300 #: users/serializers/user.py:304
msgid "The newly set password is inconsistent" msgid "The newly set password is inconsistent"
msgstr "两次密码不一致" msgstr "两次密码不一致"
@ -3298,7 +3305,7 @@ msgstr "安全令牌验证"
#: users/templates/users/_base_otp.html:14 users/templates/users/_user.html:13 #: users/templates/users/_base_otp.html:14 users/templates/users/_user.html:13
#: users/templates/users/user_profile_update.html:55 #: users/templates/users/user_profile_update.html:55
#: xpack/plugins/cloud/models.py:124 xpack/plugins/cloud/serializers.py:83 #: xpack/plugins/cloud/models.py:125 xpack/plugins/cloud/serializers.py:114
msgid "Account" msgid "Account"
msgstr "账户" msgstr "账户"
@ -3462,7 +3469,7 @@ msgstr "很强"
#: users/templates/users/user_database_app_permission.html:41 #: users/templates/users/user_database_app_permission.html:41
#: users/templates/users/user_list.html:19 #: users/templates/users/user_list.html:19
#: users/templates/users/user_remote_app_permission.html:41 #: users/templates/users/user_remote_app_permission.html:41
#: xpack/plugins/cloud/models.py:51 #: xpack/plugins/cloud/models.py:52
msgid "Validity" msgid "Validity"
msgstr "有效" msgstr "有效"
@ -4240,75 +4247,75 @@ msgstr ""
msgid "Access key secret" msgid "Access key secret"
msgstr "" msgstr ""
#: xpack/plugins/cloud/models.py:65 #: xpack/plugins/cloud/models.py:66
msgid "Cloud account" msgid "Cloud account"
msgstr "云账号" msgstr "云账号"
#: xpack/plugins/cloud/models.py:120 #: xpack/plugins/cloud/models.py:121
msgid "Instance name" msgid "Instance name"
msgstr "实例名称" msgstr "实例名称"
#: xpack/plugins/cloud/models.py:121 #: xpack/plugins/cloud/models.py:122
msgid "Instance name and Partial IP" msgid "Instance name and Partial IP"
msgstr "实例名称和部分IP" msgstr "实例名称和部分IP"
#: xpack/plugins/cloud/models.py:127 xpack/plugins/cloud/serializers.py:59 #: xpack/plugins/cloud/models.py:128 xpack/plugins/cloud/serializers.py:90
msgid "Regions" msgid "Regions"
msgstr "地域" msgstr "地域"
#: xpack/plugins/cloud/models.py:130 #: xpack/plugins/cloud/models.py:131
msgid "Instances" msgid "Instances"
msgstr "实例" msgstr "实例"
#: xpack/plugins/cloud/models.py:134 #: xpack/plugins/cloud/models.py:135
msgid "Hostname strategy" msgid "Hostname strategy"
msgstr "主机名策略" msgstr "主机名策略"
#: xpack/plugins/cloud/models.py:146 xpack/plugins/cloud/serializers.py:87 #: xpack/plugins/cloud/models.py:147 xpack/plugins/cloud/serializers.py:118
msgid "Always update" msgid "Always update"
msgstr "总是更新" msgstr "总是更新"
#: xpack/plugins/cloud/models.py:152 #: xpack/plugins/cloud/models.py:153
msgid "Date last sync" msgid "Date last sync"
msgstr "最后同步日期" msgstr "最后同步日期"
#: xpack/plugins/cloud/models.py:163 xpack/plugins/cloud/models.py:219 #: xpack/plugins/cloud/models.py:164 xpack/plugins/cloud/models.py:220
msgid "Sync instance task" msgid "Sync instance task"
msgstr "同步实例任务" msgstr "同步实例任务"
#: xpack/plugins/cloud/models.py:229 xpack/plugins/cloud/models.py:284 #: xpack/plugins/cloud/models.py:230 xpack/plugins/cloud/models.py:285
msgid "Date sync" msgid "Date sync"
msgstr "同步日期" msgstr "同步日期"
#: xpack/plugins/cloud/models.py:257 #: xpack/plugins/cloud/models.py:258
msgid "Unsync" msgid "Unsync"
msgstr "未同步" msgstr "未同步"
#: xpack/plugins/cloud/models.py:258 #: xpack/plugins/cloud/models.py:259
msgid "New Sync" msgid "New Sync"
msgstr "新同步" msgstr "新同步"
#: xpack/plugins/cloud/models.py:259 #: xpack/plugins/cloud/models.py:260
msgid "Synced" msgid "Synced"
msgstr "已同步" msgstr "已同步"
#: xpack/plugins/cloud/models.py:260 #: xpack/plugins/cloud/models.py:261
msgid "Released" msgid "Released"
msgstr "已释放" msgstr "已释放"
#: xpack/plugins/cloud/models.py:265 #: xpack/plugins/cloud/models.py:266
msgid "Sync task" msgid "Sync task"
msgstr "同步任务" msgstr "同步任务"
#: xpack/plugins/cloud/models.py:269 #: xpack/plugins/cloud/models.py:270
msgid "Sync instance task history" msgid "Sync instance task history"
msgstr "同步实例任务历史" msgstr "同步实例任务历史"
#: xpack/plugins/cloud/models.py:272 #: xpack/plugins/cloud/models.py:273
msgid "Instance" msgid "Instance"
msgstr "实例" msgstr "实例"
#: xpack/plugins/cloud/models.py:275 #: xpack/plugins/cloud/models.py:276
msgid "Region" msgid "Region"
msgstr "地域" msgstr "地域"
@ -4324,6 +4331,10 @@ msgstr "AWS (国际)"
msgid "AWS (China)" msgid "AWS (China)"
msgstr "AWS (中国)" msgstr "AWS (中国)"
#: xpack/plugins/cloud/providers/azure_.py:18
msgid "Azure (China)"
msgstr "Azure (中国)"
#: xpack/plugins/cloud/providers/huaweicloud.py:20 #: xpack/plugins/cloud/providers/huaweicloud.py:20
msgid "Huawei Cloud" msgid "Huawei Cloud"
msgstr "华为云" msgstr "华为云"
@ -4384,15 +4395,23 @@ msgstr "拉美-圣地亚哥"
msgid "Tencent Cloud" msgid "Tencent Cloud"
msgstr "腾讯云" msgstr "腾讯云"
#: xpack/plugins/cloud/serializers.py:57 #: xpack/plugins/cloud/serializers.py:26
msgid "Tenant ID"
msgstr ""
#: xpack/plugins/cloud/serializers.py:30
msgid "Subscription ID"
msgstr ""
#: xpack/plugins/cloud/serializers.py:88
msgid "History count" msgid "History count"
msgstr "执行次数" msgstr "执行次数"
#: xpack/plugins/cloud/serializers.py:58 #: xpack/plugins/cloud/serializers.py:89
msgid "Instance count" msgid "Instance count"
msgstr "实例个数" msgstr "实例个数"
#: xpack/plugins/cloud/serializers.py:86 #: xpack/plugins/cloud/serializers.py:117
#: xpack/plugins/gathered_user/serializers.py:20 #: xpack/plugins/gathered_user/serializers.py:20
msgid "Periodic display" msgid "Periodic display"
msgstr "定时执行" msgstr "定时执行"
@ -4485,14 +4504,15 @@ msgstr "旗舰版"
msgid "Community edition" msgid "Community edition"
msgstr "社区版" msgstr "社区版"
#, python-format
#~ msgid "The max size of CSV is %d bytes"
#~ msgstr "CSV 文件最大为 %d 字节"
#, fuzzy #, fuzzy
#~| msgid "Confirmed system user" #~| msgid "Confirmed system user"
#~ msgid "Confirmed systemusers" #~ msgid "Confirmed systemusers"
#~ msgstr "确认的系统用户" #~ msgstr "确认的系统用户"
#~ msgid "Azure (China)"
#~ msgstr "Azure (中国)"
#~ msgid "MFA level" #~ msgid "MFA level"
#~ msgstr "多因子认证级别" #~ msgstr "多因子认证级别"