From 5e5cd80bc2a89d1440c7bdedf4381e3ec295f3bf Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 29 Apr 2021 12:21:39 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=89=8D=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/authentication/errors.py | 2 +- apps/authentication/mixins.py | 1 - apps/authentication/views/login.py | 15 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 76682 -> 72318 bytes apps/locale/zh/LC_MESSAGES/django.po | 689 +++++++++---------- apps/templates/flash_message_standalone.html | 8 +- 6 files changed, 341 insertions(+), 374 deletions(-) diff --git a/apps/authentication/errors.py b/apps/authentication/errors.py index 46f3b8fc5..03368baa8 100644 --- a/apps/authentication/errors.py +++ b/apps/authentication/errors.py @@ -277,7 +277,7 @@ class PasswdTooSimple(JMSException): class PasswdNeedUpdate(JMSException): default_code = 'passwd_need_update' - default_detail = _('The administrator require you to change your password this time') + default_detail = _('You should to change your password before login') def __init__(self, url, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/apps/authentication/mixins.py b/apps/authentication/mixins.py index b336307c7..186f46911 100644 --- a/apps/authentication/mixins.py +++ b/apps/authentication/mixins.py @@ -233,7 +233,6 @@ class AuthMixin: ) raise errors.PasswdNeedUpdate(url) - @classmethod def _check_password_require_reset_or_not(cls, user: User): if user.password_has_expired: diff --git a/apps/authentication/views/login.py b/apps/authentication/views/login.py index a43ddf5eb..b57d8b5aa 100644 --- a/apps/authentication/views/login.py +++ b/apps/authentication/views/login.py @@ -31,7 +31,8 @@ from ..forms import get_user_login_form_cls __all__ = [ 'UserLoginView', 'UserLogoutView', 'UserLoginGuardView', 'UserLoginWaitConfirmView', - 'FlashPasswdTooSimpleMsgView', 'FlashPasswdHasExpiredMsgView', 'FlashPasswdNeedUpdateMsgView' + 'FlashPasswdTooSimpleMsgView', 'FlashPasswdHasExpiredMsgView', + 'FlashPasswdNeedUpdateMsgView' ] @@ -218,7 +219,7 @@ class UserLogoutView(TemplateView): context = { 'title': _('Logout success'), 'messages': _('Logout success, return login page'), - 'interval': 1, + 'interval': 3, 'redirect_url': reverse('authentication:login'), 'auto_redirect': True, } @@ -234,7 +235,7 @@ class FlashPasswdTooSimpleMsgView(TemplateView): context = { 'title': _('Please change your password'), 'messages': _('Your password is too simple, please change it for security'), - 'interval': 5, + 'interval': 3, 'redirect_url': request.GET.get('redirect_url'), 'auto_redirect': True, } @@ -248,10 +249,11 @@ class FlashPasswdNeedUpdateMsgView(TemplateView): def get(self, request, *args, **kwargs): context = { 'title': _('Please change your password'), - 'messages': _('The administrator require you to change your password this time'), - 'interval': 8, + 'messages': _('You should to change your password before login'), + 'interval': 3, 'redirect_url': request.GET.get('redirect_url'), 'auto_redirect': True, + 'confirm_button': _('Confirm') } return self.render_to_response(context) @@ -264,8 +266,9 @@ class FlashPasswdHasExpiredMsgView(TemplateView): context = { 'title': _('Please change your password'), 'messages': _('Your password has expired, please reset before logging in'), - 'interval': 5, + 'interval': 3, 'redirect_url': request.GET.get('redirect_url'), 'auto_redirect': True, + 'confirm_button': _('Confirm') } return self.render_to_response(context) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index b661bf7fde6ed307d17345315bfec8f1a3006672..c4b35117ec8a1141bf17650a9a19b576922d926f 100644 GIT binary patch delta 21543 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 t?c0gh$4$Ob)#=A8lE(=peHEh{{hkZf*1e* delta 25528 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 B#%2Hj diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index c6520c29b..cbe271ba3 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-27 18:00+0800\n" +"POT-Creation-Date: 2021-04-29 12:17+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -25,7 +25,7 @@ msgstr "" #: orgs/models.py:23 perms/models/base.py:49 settings/models.py:29 #: terminal/models/storage.py:23 terminal/models/storage.py:90 #: terminal/models/task.py:16 terminal/models/terminal.py:100 -#: users/forms/profile.py:32 users/models/group.py:15 users/models/user.py:535 +#: users/forms/profile.py:32 users/models/group.py:15 users/models/user.py:555 #: users/templates/users/_select_user_modal.html:13 #: users/templates/users/user_asset_permission.html:37 #: users/templates/users/user_asset_permission.html:154 @@ -61,7 +61,7 @@ msgstr "激活中" #: orgs/models.py:26 perms/models/base.py:57 settings/models.py:34 #: terminal/models/storage.py:29 terminal/models/storage.py:96 #: terminal/models/terminal.py:114 tickets/models/ticket.py:73 -#: users/models/group.py:16 users/models/user.py:568 +#: users/models/group.py:16 users/models/user.py:588 #: xpack/plugins/change_auth_plan/models.py:77 xpack/plugins/cloud/models.py:35 #: xpack/plugins/cloud/models.py:98 xpack/plugins/gathered_user/models.py:26 msgid "Comment" @@ -98,8 +98,9 @@ msgstr "动作" #: perms/models/base.py:50 templates/index.html:78 #: terminal/backends/command/models.py:18 #: terminal/backends/command/serializers.py:12 terminal/models/session.py:38 -#: tickets/models/comment.py:17 users/models/user.py:164 -#: users/models/user.py:712 users/serializers/group.py:20 +#: tickets/models/comment.py:17 users/models/user.py:184 +#: users/models/user.py:733 users/models/user.py:759 +#: users/serializers/group.py:20 #: users/templates/users/user_asset_permission.html:38 #: users/templates/users/user_asset_permission.html:64 #: users/templates/users/user_database_app_permission.html:37 @@ -137,7 +138,7 @@ msgstr "资产" msgid "Reviewers" msgstr "审批人" -#: acls/models/login_asset_acl.py:86 tickets/const.py:12 +#: acls/models/login_asset_acl.py:89 tickets/const.py:12 msgid "Login asset confirm" msgstr "登录资产复核" @@ -179,7 +180,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. " #: applications/serializers/attrs/application_type/vmware_client.py:26 #: assets/models/base.py:251 assets/models/gathered_user.py:15 #: audits/models.py:100 authentication/forms.py:15 authentication/forms.py:17 -#: ops/models/adhoc.py:148 users/forms/profile.py:31 users/models/user.py:533 +#: ops/models/adhoc.py:148 users/forms/profile.py:31 users/models/user.py:553 #: users/templates/users/_select_user_modal.html:14 #: xpack/plugins/change_auth_plan/models.py:47 #: xpack/plugins/change_auth_plan/models.py:278 @@ -315,7 +316,7 @@ msgstr "目标URL" #: applications/serializers/attrs/application_type/mysql_workbench.py:34 #: applications/serializers/attrs/application_type/vmware_client.py:30 #: assets/models/base.py:252 assets/serializers/asset_user.py:71 -#: audits/signals_handler.py:46 authentication/forms.py:22 +#: audits/signals_handler.py:58 authentication/forms.py:22 #: authentication/templates/authentication/login.html:155 #: settings/serializers/settings.py:93 users/forms/profile.py:21 #: users/templates/users/user_otp_check_password.html:13 @@ -482,7 +483,7 @@ msgstr "标签管理" #: assets/models/cluster.py:28 assets/models/cmd_filter.py:26 #: assets/models/cmd_filter.py:67 assets/models/group.py:21 #: common/db/models.py:70 common/mixins/models.py:49 orgs/models.py:24 -#: orgs/models.py:422 perms/models/base.py:55 users/models/user.py:576 +#: orgs/models.py:422 perms/models/base.py:55 users/models/user.py:596 #: users/serializers/group.py:35 xpack/plugins/change_auth_plan/models.py:81 #: xpack/plugins/cloud/models.py:104 xpack/plugins/gathered_user/models.py:30 msgid "Created by" @@ -496,7 +497,7 @@ msgstr "创建者" #: assets/models/label.py:25 common/db/models.py:72 common/mixins/models.py:50 #: ops/models/adhoc.py:38 ops/models/command.py:29 orgs/models.py:25 #: orgs/models.py:420 perms/models/base.py:56 users/models/group.py:18 -#: xpack/plugins/cloud/models.py:107 +#: users/models/user.py:760 xpack/plugins/cloud/models.py:107 msgid "Date created" msgstr "创建日期" @@ -542,7 +543,7 @@ msgstr "带宽" msgid "Contact" msgstr "联系人" -#: assets/models/cluster.py:22 users/models/user.py:554 +#: assets/models/cluster.py:22 users/models/user.py:574 msgid "Phone" msgstr "手机" @@ -568,7 +569,7 @@ msgid "Default" msgstr "默认" #: assets/models/cluster.py:36 assets/models/label.py:14 -#: users/models/user.py:724 +#: users/models/user.py:745 msgid "System" msgstr "系统" @@ -661,7 +662,7 @@ msgstr "新节点" msgid "empty" msgstr "空" -#: assets/models/node.py:546 perms/models/asset_permission.py:156 +#: assets/models/node.py:546 perms/models/asset_permission.py:176 msgid "Key" msgstr "键" @@ -669,7 +670,7 @@ msgstr "键" msgid "Full value" msgstr "全称" -#: assets/models/node.py:551 perms/models/asset_permission.py:157 +#: assets/models/node.py:551 perms/models/asset_permission.py:177 msgid "Parent key" msgstr "ssh私钥" @@ -786,7 +787,7 @@ msgstr "网域名称" msgid "Admin user name" msgstr "管理用户名称" -#: assets/serializers/asset.py:71 +#: assets/serializers/asset.py:71 perms/serializers/asset/permission.py:47 msgid "Nodes name" msgstr "节点名称" @@ -813,11 +814,11 @@ msgid "Backend" msgstr "后端" #: assets/serializers/asset_user.py:75 users/forms/profile.py:160 -#: users/models/user.py:565 users/templates/users/user_password_update.html:48 +#: users/models/user.py:585 users/templates/users/user_password_update.html:48 msgid "Public key" msgstr "SSH公钥" -#: assets/serializers/asset_user.py:79 users/models/user.py:562 +#: assets/serializers/asset_user.py:79 users/models/user.py:582 msgid "Private key" msgstr "ssh私钥" @@ -839,7 +840,7 @@ msgstr "网关数量" #: assets/serializers/label.py:13 assets/serializers/system_user.py:45 #: assets/serializers/system_user.py:166 -#: perms/serializers/asset/permission.py:66 +#: perms/serializers/asset/permission.py:72 msgid "Assets amount" msgstr "资产数量" @@ -861,7 +862,7 @@ msgid "The same level node name cannot be the same" msgstr "同级别节点名字不能重复" #: assets/serializers/system_user.py:44 assets/serializers/system_user.py:165 -#: perms/serializers/asset/permission.py:67 +#: perms/serializers/asset/permission.py:73 msgid "Nodes amount" msgstr "节点数量" @@ -1126,8 +1127,8 @@ msgstr "用户代理" #: audits/models.py:105 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 #: authentication/templates/authentication/login_otp.html:6 -#: users/forms/profile.py:64 users/models/user.py:557 -#: users/serializers/profile.py:99 +#: users/forms/profile.py:64 users/models/user.py:577 +#: users/serializers/profile.py:104 msgid "MFA" msgstr "多因子认证" @@ -1195,11 +1196,11 @@ msgstr "运行用户(显示名称)" msgid "User for display" msgstr "用户(显示名称)" -#: audits/signals_handler.py:45 +#: audits/signals_handler.py:57 msgid "SSH Key" msgstr "SSH 密钥" -#: audits/signals_handler.py:47 +#: audits/signals_handler.py:59 msgid "SSO" msgstr "" @@ -1359,15 +1360,15 @@ msgstr "来源 IP 不被允许登录" msgid "SSO auth closed" msgstr "SSO 认证关闭了" -#: authentication/errors.py:271 authentication/views/login.py:236 +#: authentication/errors.py:271 authentication/views/login.py:237 msgid "Your password is too simple, please change it for security" msgstr "你的密码过于简单,为了安全,请修改" -#: authentication/errors.py:280 authentication/views/login.py:251 -msgid "The administrator require you to change your password this time" -msgstr "管理员要求您本次修改密码" +#: authentication/errors.py:280 authentication/views/login.py:252 +msgid "You should to change your password before login" +msgstr "登录完成前,请先修改密码" -#: authentication/errors.py:289 authentication/views/login.py:266 +#: authentication/errors.py:289 authentication/views/login.py:268 msgid "Your password has expired, please reset before logging in" msgstr "您的密码已过期,先修改再登录" @@ -1414,13 +1415,13 @@ msgid "Show" msgstr "显示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/models/user.py:450 users/serializers/profile.py:96 +#: users/models/user.py:470 users/serializers/profile.py:101 #: users/templates/users/user_verify_mfa.html:32 msgid "Disable" msgstr "禁用" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/models/user.py:451 users/serializers/profile.py:97 +#: users/models/user.py:471 users/serializers/profile.py:102 msgid "Enable" msgstr "启用" @@ -1452,6 +1453,7 @@ msgid "Need MFA for view auth" msgstr "需要多因子认证来查看账号信息" #: authentication/templates/authentication/_mfa_confirm_modal.html:20 +#: authentication/views/login.py:256 authentication/views/login.py:272 #: templates/_modal.html:23 users/templates/users/user_password_verify.html:20 msgid "Confirm" msgstr "确认" @@ -1517,7 +1519,7 @@ msgid "Copy link" msgstr "复制链接" #: authentication/templates/authentication/login_wait_confirm.html:51 -#: templates/flash_message_standalone.html:34 +#: templates/flash_message_standalone.html:38 msgid "Return" msgstr "返回" @@ -1525,11 +1527,11 @@ msgstr "返回" msgid "Copy success" msgstr "复制成功" -#: authentication/views/login.py:57 +#: authentication/views/login.py:58 msgid "Please enable cookies and try again." msgstr "设置你的浏览器支持cookie" -#: authentication/views/login.py:182 +#: authentication/views/login.py:183 msgid "" "Wait for {} confirm, You also can copy link to her/him
\n" " Don't close this page" @@ -1537,19 +1539,20 @@ msgstr "" "等待 {} 确认, 你也可以复制链接发给他/她
\n" " 不要关闭本页面" -#: authentication/views/login.py:187 +#: authentication/views/login.py:188 msgid "No ticket found" msgstr "没有发现工单" -#: authentication/views/login.py:219 +#: authentication/views/login.py:220 msgid "Logout success" msgstr "退出登录成功" -#: authentication/views/login.py:220 +#: authentication/views/login.py:221 msgid "Logout success, return login page" msgstr "退出登录成功,返回到登录页面" -#: authentication/views/login.py:235 authentication/views/login.py:250 +#: authentication/views/login.py:236 authentication/views/login.py:251 +#: authentication/views/login.py:267 msgid "Please change your password" msgstr "请修改密码" @@ -1600,6 +1603,10 @@ msgstr "" msgid "Is referenced by other objects and cannot be deleted" msgstr "被其他对象关联,不能删除" +#: common/exceptions.py:47 +msgid "This action require verify your MFA" +msgstr "" + #: common/fields/model.py:80 msgid "Marshal dict data to char field" msgstr "" @@ -1873,7 +1880,7 @@ msgstr "组织审计员" msgid "GLOBAL" msgstr "全局组织" -#: orgs/models.py:419 users/models/user.py:545 +#: orgs/models.py:419 users/models/user.py:565 #: users/templates/users/_select_user_modal.html:15 msgid "Role" msgstr "角色" @@ -1886,7 +1893,7 @@ msgstr "管理员正在修改授权,请稍等" msgid "The authorization cannot be revoked for the time being" msgstr "该授权暂时不能撤销" -#: perms/models/application_permission.py:27 users/models/user.py:165 +#: perms/models/application_permission.py:27 users/models/user.py:185 msgid "Application" msgstr "应用程序" @@ -1927,7 +1934,7 @@ msgid "Clipboard copy paste" msgstr "剪贴板复制粘贴" #: perms/models/asset_permission.py:102 -#: perms/serializers/asset/permission.py:63 +#: perms/serializers/asset/permission.py:69 msgid "Actions" msgstr "动作" @@ -1936,16 +1943,16 @@ msgstr "动作" msgid "Asset permission" msgstr "资产授权" -#: perms/models/asset_permission.py:189 +#: perms/models/asset_permission.py:209 msgid "Ungrouped" msgstr "未分组" -#: perms/models/asset_permission.py:191 +#: perms/models/asset_permission.py:211 msgid "Favorite" msgstr "收藏夹" #: perms/models/base.py:51 templates/_nav.html:21 users/models/group.py:31 -#: users/models/user.py:541 users/templates/users/_select_user_modal.html:16 +#: users/models/user.py:561 users/templates/users/_select_user_modal.html:16 #: users/templates/users/user_asset_permission.html:39 #: users/templates/users/user_asset_permission.html:67 #: users/templates/users/user_database_app_permission.html:38 @@ -1958,7 +1965,7 @@ msgstr "用户组" #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:77 #: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:43 #: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:81 -#: users/models/user.py:573 +#: users/models/user.py:593 msgid "Date expired" msgstr "失效日期" @@ -1969,24 +1976,48 @@ msgid "" msgstr "应用列表中包含与授权类型不同的应用。({})" #: perms/serializers/asset/permission.py:43 -#: perms/serializers/asset/permission.py:61 users/serializers/user.py:34 +#: perms/serializers/asset/permission.py:67 users/serializers/user.py:34 #: users/serializers/user.py:70 msgid "Is expired" msgstr "是否过期" -#: perms/serializers/asset/permission.py:62 users/serializers/user.py:69 +#: perms/serializers/asset/permission.py:44 +#, fuzzy +#| msgid "Username" +msgid "Users name" +msgstr "用户名" + +#: perms/serializers/asset/permission.py:45 +#, fuzzy +#| msgid "User groups amount" +msgid "User groups name" +msgstr "用户组数量" + +#: perms/serializers/asset/permission.py:46 +#, fuzzy +#| msgid "Asset num" +msgid "Assets name" +msgstr "资产数量" + +#: perms/serializers/asset/permission.py:48 +#, fuzzy +#| msgid "System users amount" +msgid "System users name" +msgstr "系统用户数量" + +#: perms/serializers/asset/permission.py:68 users/serializers/user.py:69 msgid "Is valid" msgstr "账户是否有效" -#: perms/serializers/asset/permission.py:64 users/serializers/group.py:36 +#: perms/serializers/asset/permission.py:70 users/serializers/group.py:36 msgid "Users amount" msgstr "用户数量" -#: perms/serializers/asset/permission.py:65 +#: perms/serializers/asset/permission.py:71 msgid "User groups amount" msgstr "用户组数量" -#: perms/serializers/asset/permission.py:68 +#: perms/serializers/asset/permission.py:74 msgid "System users amount" msgstr "系统用户数量" @@ -2198,7 +2229,9 @@ msgstr "密钥认证" msgid "" "Tips: If use other auth method, like AD/LDAP, you should disable this to " "avoid being able to log in after deleting" -msgstr "提示:如果你使用其它认证方式,如 AD/LDAP,你应该禁用此项,以避免第三方系统删除后,还可以登录" +msgstr "" +"提示:如果你使用其它认证方式,如 AD/LDAP,你应该禁用此项,以避免第三方系统删" +"除后,还可以登录" #: settings/serializers/settings.py:129 msgid "List sort by" @@ -2287,46 +2320,48 @@ msgstr "" "提示:(单位:天)如果用户在此期间没有更新密码,用户密码将过期失效; 密码过期" "提醒邮件将在密码过期前5天内由系统(每天)自动发送给用户" -#: settings/serializers/settings.py:168 +#: settings/serializers/settings.py:172 msgid "Number of repeated historical passwords" msgstr "历史密码可重复次数" -#: settings/serializers/settings.py:169 +#: settings/serializers/settings.py:173 msgid "" "Tip: When the user resets the password, it cannot be the previous n " "historical passwords of the user (the value of n here is the value filled in " "the input box)" -msgstr "提示:用户重置密码时,不能为该用户前n次历史密码 (此处的n值即为输入框中填写的值)" +msgstr "" +"提示:用户重置密码时,不能为该用户前n次历史密码 (此处的n值即为输入框中填写的" +"值)" -#: settings/serializers/settings.py:173 +#: settings/serializers/settings.py:177 msgid "Password minimum length" msgstr "密码最小长度" -#: settings/serializers/settings.py:176 +#: settings/serializers/settings.py:180 msgid "Must contain capital" msgstr "必须包含大写字符" -#: settings/serializers/settings.py:178 +#: settings/serializers/settings.py:182 msgid "Must contain lowercase" msgstr "必须包含小写字符" -#: settings/serializers/settings.py:179 +#: settings/serializers/settings.py:183 msgid "Must contain numeric" msgstr "必须包含数字" -#: settings/serializers/settings.py:180 +#: settings/serializers/settings.py:184 msgid "Must contain special" msgstr "必须包含特殊字符" -#: settings/serializers/settings.py:181 +#: settings/serializers/settings.py:185 msgid "Insecure command alert" msgstr "危险命令告警" -#: settings/serializers/settings.py:183 +#: settings/serializers/settings.py:187 msgid "Email recipient" msgstr "邮件收件人" -#: settings/serializers/settings.py:184 +#: settings/serializers/settings.py:188 msgid "Multiple user using , split" msgstr "多个用户,使用 , 分割" @@ -2919,6 +2954,10 @@ msgstr "测试成功" msgid "Test failure: Account invalid" msgstr "测试失败: 账户无效" +#: terminal/backends/command/es.py:27 +msgid "Invalid elasticsearch config" +msgstr "" + #: terminal/backends/command/models.py:14 msgid "Ordinary" msgstr "普通" @@ -3651,7 +3690,7 @@ msgstr "确认密码" msgid "Password does not match" msgstr "密码不一致" -#: users/forms/profile.py:101 users/models/user.py:537 +#: users/forms/profile.py:101 users/models/user.py:557 msgid "Email" msgstr "邮件" @@ -3683,48 +3722,48 @@ msgstr "复制你的公钥到这里" msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" -#: users/forms/profile.py:149 users/serializers/profile.py:71 -#: users/serializers/profile.py:145 users/serializers/profile.py:158 +#: users/forms/profile.py:149 users/serializers/profile.py:76 +#: users/serializers/profile.py:150 users/serializers/profile.py:163 msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" -#: users/models/user.py:162 +#: users/models/user.py:182 msgid "System administrator" msgstr "系统管理员" -#: users/models/user.py:163 +#: users/models/user.py:183 msgid "System auditor" msgstr "系统审计员" -#: users/models/user.py:452 +#: users/models/user.py:472 msgid "Force enable" msgstr "强制启用" -#: users/models/user.py:517 +#: users/models/user.py:537 msgid "Local" msgstr "数据库" -#: users/models/user.py:548 +#: users/models/user.py:568 msgid "Avatar" msgstr "头像" -#: users/models/user.py:551 +#: users/models/user.py:571 msgid "Wechat" msgstr "微信" -#: users/models/user.py:581 +#: users/models/user.py:601 msgid "Source" msgstr "用户来源" -#: users/models/user.py:585 +#: users/models/user.py:605 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:720 +#: users/models/user.py:741 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:723 +#: users/models/user.py:744 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -3732,7 +3771,7 @@ msgstr "Administrator是初始的超级管理员" msgid "The old password is incorrect" msgstr "旧密码错误" -#: users/serializers/profile.py:37 users/serializers/user.py:113 +#: users/serializers/profile.py:36 users/serializers/user.py:113 msgid "Password does not match security rules" msgstr "密码不满足安全规则" @@ -3744,7 +3783,7 @@ msgstr "新密码不能是最近 {} 次的密码" msgid "The newly set password is inconsistent" msgstr "两次密码不一致" -#: users/serializers/profile.py:116 users/serializers/user.py:68 +#: users/serializers/profile.py:121 users/serializers/user.py:68 msgid "Is first login" msgstr "首次登录" @@ -3842,14 +3881,6 @@ msgstr "选择用户" msgid "Asset num" msgstr "资产数量" -#: users/templates/users/_user.html:21 -msgid "Auth" -msgstr "认证" - -#: users/templates/users/_user.html:27 -msgid "Security and Role" -msgstr "角色安全" - #: users/templates/users/_user_detail_nav_header.html:11 msgid "User detail" msgstr "用户详情" @@ -3967,229 +3998,6 @@ msgstr "包含" msgid "Exclude" msgstr "不包含" -#: users/templates/users/user_bulk_update.html:8 -msgid "Select properties that need to be modified" -msgstr "选择需要修改属性" - -#: users/templates/users/user_bulk_update.html:10 -msgid "Select all" -msgstr "全选" - -#: users/templates/users/user_create.html:4 -#: users/templates/users/user_list.html:7 -msgid "Create user" -msgstr "创建用户" - -#: users/templates/users/user_detail.html:80 -msgid "Force enabled" -msgstr "强制启用" - -#: users/templates/users/user_detail.html:101 -#: users/templates/users/user_profile.html:106 -msgid "Date joined" -msgstr "创建日期" - -#: users/templates/users/user_detail.html:105 -#: users/templates/users/user_profile.html:110 -msgid "Last login" -msgstr "最后登录" - -#: users/templates/users/user_detail.html:110 -#: users/templates/users/user_profile.html:115 -msgid "Last password updated" -msgstr "最后更新密码" - -#: users/templates/users/user_detail.html:126 -#: users/templates/users/user_profile.html:150 -msgid "Quick modify" -msgstr "快速修改" - -#: users/templates/users/user_detail.html:148 -msgid "Force enabled MFA" -msgstr "强制启用多因子认证" - -#: users/templates/users/user_detail.html:165 -msgid "Reset MFA" -msgstr "重置多因子认证" - -#: users/templates/users/user_detail.html:174 -msgid "Send reset password mail" -msgstr "发送重置密码邮件" - -#: users/templates/users/user_detail.html:177 -#: users/templates/users/user_detail.html:187 -msgid "Send" -msgstr "发送" - -#: users/templates/users/user_detail.html:184 -msgid "Send reset ssh key mail" -msgstr "发送重置密钥邮件" - -#: users/templates/users/user_detail.html:193 -#: users/templates/users/user_detail.html:490 -msgid "Unblock user" -msgstr "解除登录限制" - -#: users/templates/users/user_detail.html:196 -msgid "Unblock" -msgstr "解除" - -#: users/templates/users/user_detail.html:217 -msgid "Join user groups" -msgstr "添加到用户组" - -#: users/templates/users/user_detail.html:226 -msgid "Join" -msgstr "加入" - -#: users/templates/users/user_detail.html:356 -#: users/templates/users/user_detail.html:383 -msgid "Update successfully!" -msgstr "更新成功" - -#: users/templates/users/user_detail.html:365 -msgid "Goto profile page enable MFA" -msgstr "请去个人信息页面启用自己的多因子认证" - -#: users/templates/users/user_detail.html:401 -msgid "An e-mail has been sent to the user`s mailbox." -msgstr "已发送邮件到用户邮箱" - -#: users/templates/users/user_detail.html:411 -#: users/templates/users/user_detail.html:437 -#: users/templates/users/user_detail.html:505 -#: users/templates/users/user_list.html:178 -msgid "Are you sure?" -msgstr "你确认吗?" - -#: users/templates/users/user_detail.html:412 -msgid "This will reset the user password and send a reset mail" -msgstr "将失效用户当前密码,并发送重设密码邮件到用户邮箱" - -#: users/templates/users/user_detail.html:415 -#: users/templates/users/user_detail.html:441 -#: users/templates/users/user_detail.html:509 -#: users/templates/users/user_list.html:182 -msgid "Cancel" -msgstr "取消" - -#: users/templates/users/user_detail.html:427 -msgid "" -"The reset-ssh-public-key E-mail has been sent successfully. Please inform " -"the user to update his new ssh public key." -msgstr "重设密钥邮件将会发送到用户邮箱" - -#: users/templates/users/user_detail.html:428 -msgid "Reset SSH public key" -msgstr "重置SSH密钥" - -#: users/templates/users/user_detail.html:438 -msgid "This will reset the user public key and send a reset mail" -msgstr "将会失效用户当前密钥,并发送重置邮件到用户邮箱" - -#: users/templates/users/user_detail.html:456 -msgid "Successfully updated the SSH public key." -msgstr "更新SSH密钥成功" - -#: users/templates/users/user_detail.html:457 -#: users/templates/users/user_detail.html:461 -msgid "User SSH public key update" -msgstr "SSH密钥" - -#: users/templates/users/user_detail.html:506 -msgid "After unlocking the user, the user can log in normally." -msgstr "解除用户登录限制后,此用户即可正常登录" - -#: users/templates/users/user_detail.html:520 -msgid "Reset user MFA success" -msgstr "重置用户多因子认证成功" - -#: users/templates/users/user_granted_remote_app.html:35 -msgid "App type" -msgstr "应用类型" - -#: users/templates/users/user_group_detail.html:17 -#: users/templates/users/user_group_granted_asset.html:18 -msgid "User group detail" -msgstr "用户组详情" - -#: users/templates/users/user_group_detail.html:81 -msgid "Add user" -msgstr "添加用户" - -#: users/templates/users/user_group_detail.html:87 -msgid "Add" -msgstr "添加" - -#: users/templates/users/user_group_list.html:7 -msgid "Create user group" -msgstr "创建用户组" - -#: users/templates/users/user_list.html:30 -msgid "Delete selected" -msgstr "批量删除" - -#: users/templates/users/user_list.html:32 -msgid "Remove selected" -msgstr "批量移除" - -#: users/templates/users/user_list.html:34 -msgid "Update selected" -msgstr "批量更新" - -#: users/templates/users/user_list.html:35 -msgid "Deactive selected" -msgstr "禁用所选" - -#: users/templates/users/user_list.html:36 -msgid "Active selected" -msgstr "激活所选" - -#: users/templates/users/user_list.html:106 -#: users/templates/users/user_list.html:110 -msgid "Remove" -msgstr "移除" - -#: users/templates/users/user_list.html:179 -msgid "This will delete the selected users !!!" -msgstr "删除选中用户 !!!" - -#: users/templates/users/user_list.html:190 -msgid "User Deleting failed." -msgstr "用户删除失败" - -#: users/templates/users/user_list.html:191 -msgid "User Delete" -msgstr "删除" - -#: users/templates/users/user_list.html:213 -msgid "This will remove the selected users !!" -msgstr "移除选中用户 !!!" - -#: users/templates/users/user_list.html:215 -msgid "User Removing failed." -msgstr "用户移除失败" - -#: users/templates/users/user_list.html:216 -msgid "User Remove" -msgstr "移除" - -#: users/templates/users/user_list.html:265 -msgid "Are you sure about removing it?" -msgstr "您确定移除吗?" - -#: users/templates/users/user_list.html:266 -msgid "Remove the success" -msgstr "移除成功" - -#: users/templates/users/user_list.html:271 -msgid "User is expired" -msgstr "用户已失效" - -#: users/templates/users/user_list.html:274 -msgid "User is inactive" -msgstr "用户已禁用" - #: users/templates/users/user_otp_check_password.html:6 #: users/templates/users/user_verify_mfa.html:6 msgid "Authenticate" @@ -4243,64 +4051,6 @@ msgstr "重置" msgid "Verify password" msgstr "校验密码" -#: users/templates/users/user_profile.html:97 -msgid "Administrator Settings force MFA login" -msgstr "管理员设置强制使用多因子认证" - -#: users/templates/users/user_profile.html:156 -msgid "Set MFA" -msgstr "设置多因子认证" - -#: users/templates/users/user_profile.html:178 -msgid "Update MFA" -msgstr "更改多因子认证" - -#: users/templates/users/user_profile.html:188 -msgid "Update password" -msgstr "更改密码" - -#: users/templates/users/user_profile.html:198 -msgid "Update SSH public key" -msgstr "更改SSH密钥" - -#: users/templates/users/user_profile.html:206 -msgid "Reset public key and download" -msgstr "重置并下载SSH密钥" - -#: users/templates/users/user_pubkey_update.html:55 -msgid "Old public key" -msgstr "原来SSH密钥" - -#: users/templates/users/user_pubkey_update.html:63 -msgid "Fingerprint" -msgstr "指纹" - -#: users/templates/users/user_pubkey_update.html:69 -msgid "Update public key" -msgstr "更新密钥" - -#: users/templates/users/user_pubkey_update.html:72 -msgid "Or reset by server" -msgstr "或者重置并下载密钥" - -#: users/templates/users/user_pubkey_update.html:98 -msgid "" -"The new public key has been set successfully, Please download the " -"corresponding private key." -msgstr "新的公钥已设置成功,请下载对应的私钥" - -#: users/templates/users/user_update.html:4 -msgid "Update user" -msgstr "更新用户" - -#: users/templates/users/user_update.html:22 users/views/profile/reset.py:120 -msgid "User auth from {}, go there change password" -msgstr "用户认证源来自 {}, 请去相应系统修改密码" - -#: users/templates/users/user_update.html:32 -msgid "User auth from {}, ssh key login is not supported" -msgstr "用户认证源来自 {}, 不支持使用 SSH Key 登录" - #: users/templates/users/user_verify_mfa.html:11 msgid "" "The account protection has been opened, please complete the following " @@ -4669,6 +4419,10 @@ msgstr "重置密码成功,返回到登录页面" msgid "Token invalid or expired" msgstr "Token错误或失效" +#: users/views/profile/reset.py:120 +msgid "User auth from {}, go there change password" +msgstr "用户认证源来自 {}, 请去相应系统修改密码" + #: users/views/profile/reset.py:133 msgid "* The new password cannot be the last {} passwords" msgstr "* 新密码不能是最近 {} 次的密码" @@ -5149,6 +4903,211 @@ msgstr "旗舰版" msgid "Community edition" msgstr "社区版" +#~ msgid "The administrator require you to change your password this time" +#~ msgstr "管理员要求您本次修改密码" + +#~ msgid "Auth" +#~ msgstr "认证" + +#~ msgid "Security and Role" +#~ msgstr "角色安全" + +#~ msgid "Select properties that need to be modified" +#~ msgstr "选择需要修改属性" + +#~ msgid "Select all" +#~ msgstr "全选" + +#~ msgid "Create user" +#~ msgstr "创建用户" + +#~ msgid "Force enabled" +#~ msgstr "强制启用" + +#~ msgid "Date joined" +#~ msgstr "创建日期" + +#~ msgid "Last login" +#~ msgstr "最后登录" + +#~ msgid "Last password updated" +#~ msgstr "最后更新密码" + +#~ msgid "Quick modify" +#~ msgstr "快速修改" + +#~ msgid "Force enabled MFA" +#~ msgstr "强制启用多因子认证" + +#~ msgid "Reset MFA" +#~ msgstr "重置多因子认证" + +#~ msgid "Send reset password mail" +#~ msgstr "发送重置密码邮件" + +#~ msgid "Send" +#~ msgstr "发送" + +#~ msgid "Send reset ssh key mail" +#~ msgstr "发送重置密钥邮件" + +#~ msgid "Unblock user" +#~ msgstr "解除登录限制" + +#~ msgid "Unblock" +#~ msgstr "解除" + +#~ msgid "Join user groups" +#~ msgstr "添加到用户组" + +#~ msgid "Join" +#~ msgstr "加入" + +#~ msgid "Update successfully!" +#~ msgstr "更新成功" + +#~ msgid "Goto profile page enable MFA" +#~ msgstr "请去个人信息页面启用自己的多因子认证" + +#~ msgid "An e-mail has been sent to the user`s mailbox." +#~ msgstr "已发送邮件到用户邮箱" + +#~ msgid "Are you sure?" +#~ msgstr "你确认吗?" + +#~ msgid "This will reset the user password and send a reset mail" +#~ msgstr "将失效用户当前密码,并发送重设密码邮件到用户邮箱" + +#~ msgid "Cancel" +#~ msgstr "取消" + +#~ msgid "" +#~ "The reset-ssh-public-key E-mail has been sent successfully. Please inform " +#~ "the user to update his new ssh public key." +#~ msgstr "重设密钥邮件将会发送到用户邮箱" + +#~ msgid "Reset SSH public key" +#~ msgstr "重置SSH密钥" + +#~ msgid "This will reset the user public key and send a reset mail" +#~ msgstr "将会失效用户当前密钥,并发送重置邮件到用户邮箱" + +#~ msgid "Successfully updated the SSH public key." +#~ msgstr "更新SSH密钥成功" + +#~ msgid "User SSH public key update" +#~ msgstr "SSH密钥" + +#~ msgid "After unlocking the user, the user can log in normally." +#~ msgstr "解除用户登录限制后,此用户即可正常登录" + +#~ msgid "Reset user MFA success" +#~ msgstr "重置用户多因子认证成功" + +#~ msgid "App type" +#~ msgstr "应用类型" + +#~ msgid "User group detail" +#~ msgstr "用户组详情" + +#~ msgid "Add user" +#~ msgstr "添加用户" + +#~ msgid "Add" +#~ msgstr "添加" + +#~ msgid "Create user group" +#~ msgstr "创建用户组" + +#~ msgid "Delete selected" +#~ msgstr "批量删除" + +#~ msgid "Remove selected" +#~ msgstr "批量移除" + +#~ msgid "Update selected" +#~ msgstr "批量更新" + +#~ msgid "Deactive selected" +#~ msgstr "禁用所选" + +#~ msgid "Active selected" +#~ msgstr "激活所选" + +#~ msgid "Remove" +#~ msgstr "移除" + +#~ msgid "This will delete the selected users !!!" +#~ msgstr "删除选中用户 !!!" + +#~ msgid "User Deleting failed." +#~ msgstr "用户删除失败" + +#~ msgid "User Delete" +#~ msgstr "删除" + +#~ msgid "This will remove the selected users !!" +#~ msgstr "移除选中用户 !!!" + +#~ msgid "User Removing failed." +#~ msgstr "用户移除失败" + +#~ msgid "User Remove" +#~ msgstr "移除" + +#~ msgid "Are you sure about removing it?" +#~ msgstr "您确定移除吗?" + +#~ msgid "Remove the success" +#~ msgstr "移除成功" + +#~ msgid "User is expired" +#~ msgstr "用户已失效" + +#~ msgid "User is inactive" +#~ msgstr "用户已禁用" + +#~ msgid "Administrator Settings force MFA login" +#~ msgstr "管理员设置强制使用多因子认证" + +#~ msgid "Set MFA" +#~ msgstr "设置多因子认证" + +#~ msgid "Update MFA" +#~ msgstr "更改多因子认证" + +#~ msgid "Update password" +#~ msgstr "更改密码" + +#~ msgid "Update SSH public key" +#~ msgstr "更改SSH密钥" + +#~ msgid "Reset public key and download" +#~ msgstr "重置并下载SSH密钥" + +#~ msgid "Old public key" +#~ msgstr "原来SSH密钥" + +#~ msgid "Fingerprint" +#~ msgstr "指纹" + +#~ msgid "Update public key" +#~ msgstr "更新密钥" + +#~ msgid "Or reset by server" +#~ msgstr "或者重置并下载密钥" + +#~ msgid "" +#~ "The new public key has been set successfully, Please download the " +#~ "corresponding private key." +#~ msgstr "新的公钥已设置成功,请下载对应的私钥" + +#~ msgid "Update user" +#~ msgstr "更新用户" + +#~ msgid "User auth from {}, ssh key login is not supported" +#~ msgstr "用户认证源来自 {}, 不支持使用 SSH Key 登录" + #~ msgid "(Domain name support)" #~ msgstr "(支持域名)" diff --git a/apps/templates/flash_message_standalone.html b/apps/templates/flash_message_standalone.html index 84ef58cb5..bc27fa614 100644 --- a/apps/templates/flash_message_standalone.html +++ b/apps/templates/flash_message_standalone.html @@ -31,7 +31,13 @@ {% endif %}