diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 26741a205..f4fc01533 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index dd0c9514a..a95e8dfba 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-16 18:58+0800\n" +"POT-Creation-Date: 2021-09-16 19:25+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -25,7 +25,7 @@ msgstr "" #: orgs/models.py:24 perms/models/base.py:44 settings/models.py:29 #: settings/serializers/sms.py:6 terminal/models/storage.py:23 #: terminal/models/task.py:16 terminal/models/terminal.py:100 -#: users/forms/profile.py:32 users/models/group.py:15 users/models/user.py:604 +#: users/forms/profile.py:32 users/models/group.py:15 users/models/user.py:605 #: users/templates/users/_select_user_modal.html:13 #: users/templates/users/user_asset_permission.html:37 #: users/templates/users/user_asset_permission.html:154 @@ -60,7 +60,7 @@ msgstr "激活中" #: orgs/models.py:27 perms/models/base.py:53 settings/models.py:34 #: terminal/models/storage.py:26 terminal/models/terminal.py:114 #: tickets/models/ticket.py:71 users/models/group.py:16 -#: users/models/user.py:637 xpack/plugins/change_auth_plan/models/base.py:41 +#: users/models/user.py:638 xpack/plugins/change_auth_plan/models/base.py:41 #: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:113 #: xpack/plugins/gathered_user/models.py:26 msgid "Comment" @@ -98,7 +98,7 @@ msgstr "动作" #: terminal/backends/command/models.py:18 #: terminal/backends/command/serializers.py:12 terminal/models/session.py:38 #: tickets/models/comment.py:17 users/const.py:14 users/models/user.py:181 -#: users/models/user.py:813 users/models/user.py:839 +#: users/models/user.py:814 users/models/user.py:840 #: users/serializers/group.py:19 #: users/templates/users/user_asset_permission.html:38 #: users/templates/users/user_asset_permission.html:64 @@ -177,7 +177,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. " #: applications/serializers/attrs/application_type/vmware_client.py:26 #: assets/models/base.py:176 assets/models/gathered_user.py:15 #: audits/models.py:105 authentication/forms.py:15 authentication/forms.py:17 -#: ops/models/adhoc.py:148 users/forms/profile.py:31 users/models/user.py:602 +#: ops/models/adhoc.py:148 users/forms/profile.py:31 users/models/user.py:603 #: users/templates/users/_select_user_modal.html:14 #: xpack/plugins/change_auth_plan/models/asset.py:35 #: xpack/plugins/change_auth_plan/models/asset.py:191 @@ -531,7 +531,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:25 -#: orgs/models.py:437 perms/models/base.py:51 users/models/user.py:645 +#: orgs/models.py:437 perms/models/base.py:51 users/models/user.py:646 #: users/serializers/group.py:33 #: xpack/plugins/change_auth_plan/models/base.py:45 #: xpack/plugins/cloud/models.py:119 xpack/plugins/gathered_user/models.py:30 @@ -544,7 +544,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:26 #: orgs/models.py:435 perms/models/base.py:52 users/models/group.py:18 -#: users/models/user.py:840 xpack/plugins/cloud/models.py:122 +#: users/models/user.py:841 xpack/plugins/cloud/models.py:122 msgid "Date created" msgstr "创建日期" @@ -599,7 +599,7 @@ msgstr "带宽" msgid "Contact" msgstr "联系人" -#: assets/models/cluster.py:22 users/models/user.py:623 +#: assets/models/cluster.py:22 users/models/user.py:624 msgid "Phone" msgstr "手机" @@ -625,7 +625,7 @@ msgid "Default" msgstr "默认" #: assets/models/cluster.py:36 assets/models/label.py:14 -#: users/models/user.py:825 +#: users/models/user.py:826 msgid "System" msgstr "系统" @@ -1160,7 +1160,7 @@ msgstr "用户代理" #: audits/models.py:110 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 #: authentication/templates/authentication/login_otp.html:6 -#: users/forms/profile.py:64 users/models/user.py:626 +#: users/forms/profile.py:64 users/models/user.py:627 #: users/serializers/profile.py:102 msgid "MFA" msgstr "多因子认证" @@ -1240,13 +1240,13 @@ msgstr "认证令牌" #: audits/signals_handler.py:68 #: authentication/templates/authentication/login.html:216 -#: notifications/backends/__init__.py:11 users/models/user.py:659 +#: notifications/backends/__init__.py:11 users/models/user.py:660 msgid "WeCom" msgstr "企业微信" #: audits/signals_handler.py:69 #: authentication/templates/authentication/login.html:221 -#: notifications/backends/__init__.py:12 users/models/user.py:660 +#: notifications/backends/__init__.py:12 users/models/user.py:661 msgid "DingTalk" msgstr "钉钉" @@ -1616,15 +1616,15 @@ msgstr "来源 IP 不被允许登录" msgid "SSO auth closed" msgstr "SSO 认证关闭了" -#: authentication/errors.py:298 authentication/mixins.py:318 +#: authentication/errors.py:298 authentication/mixins.py:321 msgid "Your password is too simple, please change it for security" msgstr "你的密码过于简单,为了安全,请修改" -#: authentication/errors.py:307 authentication/mixins.py:325 +#: authentication/errors.py:307 authentication/mixins.py:328 msgid "You should to change your password before login" msgstr "登录完成前,请先修改密码" -#: authentication/errors.py:316 authentication/mixins.py:332 +#: authentication/errors.py:316 authentication/mixins.py:335 msgid "Your password has expired, please reset before logging in" msgstr "您的密码已过期,先修改再登录" @@ -1649,7 +1649,7 @@ msgstr "MFA 类型" msgid "MFA code" msgstr "多因子认证验证码" -#: authentication/mixins.py:308 +#: authentication/mixins.py:311 msgid "Please change your password" msgstr "请修改密码" @@ -1788,7 +1788,7 @@ msgid "CAS" msgstr "CAS" #: authentication/templates/authentication/login.html:226 -#: notifications/backends/__init__.py:14 users/models/user.py:661 +#: notifications/backends/__init__.py:14 users/models/user.py:662 msgid "FeiShu" msgstr "飞书" @@ -2186,7 +2186,7 @@ msgstr "" "div>" #: notifications/backends/__init__.py:10 users/forms/profile.py:101 -#: users/models/user.py:606 +#: users/models/user.py:607 msgid "Email" msgstr "邮件" @@ -2404,7 +2404,7 @@ msgstr "组织审计员" msgid "GLOBAL" msgstr "全局组织" -#: orgs/models.py:434 users/models/user.py:614 users/serializers/user.py:37 +#: orgs/models.py:434 users/models/user.py:615 users/serializers/user.py:37 #: users/templates/users/_select_user_modal.html:15 msgid "Role" msgstr "角色" @@ -2469,7 +2469,7 @@ msgid "Favorite" msgstr "收藏夹" #: perms/models/base.py:47 templates/_nav.html:21 users/models/group.py:31 -#: users/models/user.py:610 users/templates/users/_select_user_modal.html:16 +#: users/models/user.py:611 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 @@ -2480,7 +2480,7 @@ msgstr "用户组" #: perms/models/base.py:50 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:58 #: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:50 -#: users/models/user.py:642 +#: users/models/user.py:643 msgid "Date expired" msgstr "失效日期" @@ -3132,7 +3132,7 @@ msgstr "下个设备登录,上次登录会被顶掉" msgid "Only exist user login" msgstr "仅已存在用户登录" -#: settings/serializers/security.py:66 settings/serializers/security.py:70 +#: settings/serializers/security.py:66 msgid "If enable, CAS、OIDC auth will be failed, if user not exist yet" msgstr "开启后,如果系统中不存在该用户,CAS、OIDC 登录将会失败" @@ -3140,6 +3140,10 @@ msgstr "开启后,如果系统中不存在该用户,CAS、OIDC 登录将会 msgid "Only from source login" msgstr "仅从用户来源登录" +#: settings/serializers/security.py:70 +msgid "Only log in from the user source property" +msgstr "开启后,如果用户来源为本地,CAS、OIDC 登录将会失败" + #: settings/serializers/security.py:74 msgid "MFA verify TTL" msgstr "MFA 校验有效期" @@ -4758,7 +4762,7 @@ msgstr "不能和原来的密钥相同" msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" -#: users/forms/profile.py:160 users/models/user.py:634 +#: users/forms/profile.py:160 users/models/user.py:635 #: users/templates/users/user_password_update.html:48 msgid "Public key" msgstr "SSH公钥" @@ -4771,39 +4775,39 @@ msgstr "短信验证码" msgid "Force enable" msgstr "强制启用" -#: users/models/user.py:583 +#: users/models/user.py:584 msgid "Local" msgstr "数据库" -#: users/models/user.py:617 +#: users/models/user.py:618 msgid "Avatar" msgstr "头像" -#: users/models/user.py:620 +#: users/models/user.py:621 msgid "Wechat" msgstr "微信" -#: users/models/user.py:631 +#: users/models/user.py:632 msgid "Private key" msgstr "ssh私钥" -#: users/models/user.py:650 +#: users/models/user.py:651 msgid "Source" msgstr "来源" -#: users/models/user.py:654 +#: users/models/user.py:655 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:657 +#: users/models/user.py:658 msgid "Need update password" msgstr "需要更新密码" -#: users/models/user.py:821 +#: users/models/user.py:822 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:824 +#: users/models/user.py:825 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -6247,3 +6251,6 @@ msgstr "旗舰版" #: xpack/plugins/license/models.py:77 msgid "Community edition" msgstr "社区版" + +#~ msgid "Only " +#~ msgstr "仅能从用户配置来源登录" diff --git a/apps/settings/serializers/security.py b/apps/settings/serializers/security.py index 2872baa38..868d2c4ef 100644 --- a/apps/settings/serializers/security.py +++ b/apps/settings/serializers/security.py @@ -67,7 +67,7 @@ class SecurityAuthSerializer(serializers.Serializer): ) ONLY_ALLOW_AUTH_FROM_SOURCE = serializers.BooleanField( required=False, default=False, label=_("Only from source login"), - help_text=_("If enable, CAS、OIDC auth will be failed, if user not exist yet") + help_text=_("Only log in from the user source property") ) SECURITY_MFA_VERIFY_TTL = serializers.IntegerField( min_value=5, max_value=60*60*10,