diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo index d003ce451..8b20cef55 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.mo +++ b/apps/i18n/core/en/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b625eab5cb43a5e6ffe64cc68887034be25fa4b2f9134cdfca12966930721fb -size 2301 +oid sha256:3e91350085ae1a963cd47e161976e8712215648bf46d9f9253c0fdec2f7c9869 +size 2329 diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 804e654a3..9575cc669 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -2586,7 +2586,7 @@ msgstr "" #: settings/serializers/auth/feishu.py:13 users/models/user.py:751 #: users/models/user.py:857 msgid "FeiShu" -msgstr "" +msgstr "Lark" #: audits/signal_handlers/login_log.py:39 authentication/views/login.py:95 #: authentication/views/slack.py:87 notifications/backends/__init__.py:15 @@ -4989,21 +4989,13 @@ msgid "Forgot Password URL" msgstr "" #: settings/serializers/auth/base.py:29 -msgid "Enable login redirect msg" +msgid "Login redirection prompt" msgstr "" #: settings/serializers/auth/cas.py:10 msgid "CAS" msgstr "" -#: settings/serializers/auth/cas.py:12 -msgid "Enable CAS Auth" -msgstr "" - -#: settings/serializers/auth/cas.py:13 settings/serializers/auth/oidc.py:54 -msgid "Server url" -msgstr "" - #: settings/serializers/auth/cas.py:16 msgid "Proxy server url" msgstr "" @@ -5022,19 +5014,19 @@ msgid "Enable attributes map" msgstr "" #: settings/serializers/auth/cas.py:28 settings/serializers/auth/saml2.py:32 -msgid "Rename attr" +msgid "User attribute" msgstr "" #: settings/serializers/auth/cas.py:29 -msgid "Create user if not" +msgid "Create user" msgstr "" #: settings/serializers/auth/dingtalk.py:15 -msgid "Enable DingTalk Auth" +msgid "Dingtalk" msgstr "" #: settings/serializers/auth/feishu.py:16 -msgid "Enable FeiShu Auth" +msgid "Lark" msgstr "" #: settings/serializers/auth/ldap.py:39 @@ -5042,7 +5034,7 @@ msgid "LDAP" msgstr "" #: settings/serializers/auth/ldap.py:42 -msgid "LDAP server" +msgid "Server" msgstr "" #: settings/serializers/auth/ldap.py:43 @@ -5070,11 +5062,6 @@ msgstr "" msgid "Choice may be (cn|uid|sAMAccountName)=%(user)s)" msgstr "" -#: settings/serializers/auth/ldap.py:58 settings/serializers/auth/oauth2.py:56 -#: settings/serializers/auth/oidc.py:37 -msgid "User attr map" -msgstr "" - #: settings/serializers/auth/ldap.py:59 msgid "" "User attr map present how to map LDAP user attr to jumpserver, username,name," @@ -5089,17 +5076,10 @@ msgstr "" msgid "Search paged size (piece)" msgstr "" -#: settings/serializers/auth/ldap.py:84 -msgid "Enable LDAP auth" -msgstr "" - #: settings/serializers/auth/oauth2.py:18 msgid "OAuth2" msgstr "" -#: settings/serializers/auth/oauth2.py:21 -msgid "Enable OAuth2 Auth" -msgstr "" #: settings/serializers/auth/oauth2.py:24 msgid "Logo" @@ -5181,10 +5161,6 @@ msgstr "" msgid "Realm name" msgstr "" -#: settings/serializers/auth/oidc.py:63 -msgid "Enable OPENID Auth" -msgstr "" - #: settings/serializers/auth/oidc.py:65 msgid "Provider endpoint" msgstr "" @@ -5221,10 +5197,6 @@ msgstr "" msgid "Use nonce" msgstr "" -#: settings/serializers/auth/passkey.py:11 -msgid "Enable passkey Auth" -msgstr "" - #: settings/serializers/auth/passkey.py:12 msgid "Only SSL domain can use passkey auth" msgstr "" @@ -5247,10 +5219,6 @@ msgstr "" msgid "Radius" msgstr "" -#: settings/serializers/auth/radius.py:15 -msgid "Enable Radius Auth" -msgstr "" - #: settings/serializers/auth/radius.py:21 msgid "OTP in Radius" msgstr "" @@ -5259,10 +5227,6 @@ msgstr "" msgid "SAML2" msgstr "" -#: settings/serializers/auth/saml2.py:13 -msgid "Enable SAML2 Auth" -msgstr "" - #: settings/serializers/auth/saml2.py:16 msgid "IDP metadata URL" msgstr "" @@ -5283,10 +5247,6 @@ msgstr "" msgid "SP cert" msgstr "" -#: settings/serializers/auth/slack.py:12 -msgid "Enable Slack Auth" -msgstr "" - #: settings/serializers/auth/sms.py:19 msgid "SMS provider / Protocol" msgstr "" @@ -5376,10 +5336,6 @@ msgstr "" msgid "Unit: second" msgstr "" -#: settings/serializers/auth/wecom.py:15 -msgid "Enable WeCom Auth" -msgstr "" - #: settings/serializers/basic.py:11 msgid "Site URL" msgstr "" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index f644edce1..ac3cefa5b 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.mo +++ b/apps/i18n/core/ja/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8b0f6631ac25f42278b8a3f287a35dbcd9bc771f9c2cf63d9338c6f7fa633bc -size 169665 +oid sha256:6da7aefc64a80f4087d6067571d10f37da3b328abf175feb380a717931313257 +size 168890 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index f408f9718..3d1d90989 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -5146,23 +5146,15 @@ msgid "Forgot Password URL" msgstr "パスワードのURLを忘れた" #: settings/serializers/auth/base.py:29 -msgid "Enable login redirect msg" +msgid "Login redirection prompt" msgstr "ログインリダイレクトの有効化msg" #: settings/serializers/auth/cas.py:10 msgid "CAS" msgstr "CAS" -#: settings/serializers/auth/cas.py:12 -msgid "Enable CAS Auth" -msgstr "CAS 認証の有効化" - -#: settings/serializers/auth/cas.py:13 settings/serializers/auth/oidc.py:54 -msgid "Server url" -msgstr "サービス側アドレス" - #: settings/serializers/auth/cas.py:16 -msgid "Proxy server url" +msgid "Proxy Server" msgstr "コールバックアドレス" #: settings/serializers/auth/cas.py:18 settings/serializers/auth/oauth2.py:54 @@ -5179,19 +5171,19 @@ msgid "Enable attributes map" msgstr "属性マップの有効化" #: settings/serializers/auth/cas.py:28 settings/serializers/auth/saml2.py:32 -msgid "Rename attr" +msgid "User attribute" msgstr "マッピングのプロパティ" #: settings/serializers/auth/cas.py:29 -msgid "Create user if not" +msgid "Create user" msgstr "そうでない場合はユーザーを作成" #: settings/serializers/auth/dingtalk.py:15 -msgid "Enable DingTalk Auth" +msgid "Dingtalk" msgstr "ピン認証の有効化" #: settings/serializers/auth/feishu.py:16 -msgid "Enable FeiShu Auth" +msgid "Lark" msgstr "飛本認証の有効化" #: settings/serializers/auth/ldap.py:39 @@ -5199,7 +5191,7 @@ msgid "LDAP" msgstr "LDAP" #: settings/serializers/auth/ldap.py:42 -msgid "LDAP server" +msgid "Server" msgstr "LDAPサーバー" #: settings/serializers/auth/ldap.py:43 @@ -5227,11 +5219,6 @@ msgstr "ユーザー検索フィルター" msgid "Choice may be (cn|uid|sAMAccountName)=%(user)s)" msgstr "選択は (cnまたはuidまたはsAMAccountName)=%(user)s)" -#: settings/serializers/auth/ldap.py:58 settings/serializers/auth/oauth2.py:56 -#: settings/serializers/auth/oidc.py:37 -msgid "User attr map" -msgstr "ユーザー属性マッピング" - #: settings/serializers/auth/ldap.py:59 msgid "" "User attr map present how to map LDAP user attr to jumpserver, username,name," @@ -5248,18 +5235,10 @@ msgstr "接続タイムアウト (秒)" msgid "Search paged size (piece)" msgstr "ページサイズを検索 (じょう)" -#: settings/serializers/auth/ldap.py:84 -msgid "Enable LDAP auth" -msgstr "LDAP認証の有効化" - #: settings/serializers/auth/oauth2.py:18 msgid "OAuth2" msgstr "OAuth2" -#: settings/serializers/auth/oauth2.py:21 -msgid "Enable OAuth2 Auth" -msgstr "OAuth2認証の有効化" - #: settings/serializers/auth/oauth2.py:24 msgid "Logo" msgstr "アイコン" @@ -5342,10 +5321,6 @@ msgstr "Keycloakを使用する" msgid "Realm name" msgstr "レルム名" -#: settings/serializers/auth/oidc.py:63 -msgid "Enable OPENID Auth" -msgstr "OIDC認証の有効化" - #: settings/serializers/auth/oidc.py:65 msgid "Provider endpoint" msgstr "プロバイダーエンドポイント" @@ -5382,10 +5357,6 @@ msgstr "使用状態" msgid "Use nonce" msgstr "Nonceを使用" -#: settings/serializers/auth/passkey.py:11 -msgid "Enable passkey Auth" -msgstr "パスキー認証を有効にする" - #: settings/serializers/auth/passkey.py:12 msgid "Only SSL domain can use passkey auth" msgstr "SSLドメインのみがパスキー認証を使用できます" @@ -5411,10 +5382,6 @@ msgstr "FIDOサーバー名" msgid "Radius" msgstr "Radius" -#: settings/serializers/auth/radius.py:15 -msgid "Enable Radius Auth" -msgstr "Radius認証の有効化" - #: settings/serializers/auth/radius.py:21 msgid "OTP in Radius" msgstr "Radius のOTP" @@ -5423,10 +5390,6 @@ msgstr "Radius のOTP" msgid "SAML2" msgstr "SAML2" -#: settings/serializers/auth/saml2.py:13 -msgid "Enable SAML2 Auth" -msgstr "SAML2認証の有効化" - #: settings/serializers/auth/saml2.py:16 msgid "IDP metadata URL" msgstr "IDP metadata アドレス" @@ -5447,10 +5410,6 @@ msgstr "SP プライベートキー" msgid "SP cert" msgstr "SP 証明書" -#: settings/serializers/auth/slack.py:12 -msgid "Enable Slack Auth" -msgstr "Slack 認証の有効化" - #: settings/serializers/auth/sms.py:19 msgid "SMS provider / Protocol" msgstr "SMSプロバイダ / プロトコル" @@ -5544,10 +5503,6 @@ msgstr "Token有効期間" msgid "Unit: second" msgstr "単位: 秒" -#: settings/serializers/auth/wecom.py:15 -msgid "Enable WeCom Auth" -msgstr "企業微信認証の有効化" - #: settings/serializers/basic.py:11 msgid "Site URL" msgstr "サイトURL" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index 433b274e7..0e20cf1a9 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.mo +++ b/apps/i18n/core/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d54631a07b63a1dfee00e6833df24fd7835cacd1bf938f94311f6fb6550ded5b -size 140300 +oid sha256:bb1dbb645c2345048bdbeb9b842a695a222533c0362b8101db18b87bfeaaf326 +size 139633 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 3306221f9..9f21daf59 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -5037,23 +5037,15 @@ msgid "Forgot Password URL" msgstr "忘记密码 URL" #: settings/serializers/auth/base.py:29 -msgid "Enable login redirect msg" +msgid "Login redirection prompt" msgstr "启用登录跳转提示" #: settings/serializers/auth/cas.py:10 msgid "CAS" msgstr "CAS" -#: settings/serializers/auth/cas.py:12 -msgid "Enable CAS Auth" -msgstr "启用 CAS 认证" - -#: settings/serializers/auth/cas.py:13 settings/serializers/auth/oidc.py:54 -msgid "Server url" -msgstr "服务端地址" - #: settings/serializers/auth/cas.py:16 -msgid "Proxy server url" +msgid "Proxy Server" msgstr "回调地址" #: settings/serializers/auth/cas.py:18 settings/serializers/auth/oauth2.py:54 @@ -5070,19 +5062,19 @@ msgid "Enable attributes map" msgstr "启用属性映射" #: settings/serializers/auth/cas.py:28 settings/serializers/auth/saml2.py:32 -msgid "Rename attr" +msgid "User attribute" msgstr "映射属性" #: settings/serializers/auth/cas.py:29 -msgid "Create user if not" +msgid "Create user" msgstr "创建用户(如果不存在)" #: settings/serializers/auth/dingtalk.py:15 -msgid "Enable DingTalk Auth" +msgid "Dingtalk" msgstr "启用钉钉认证" #: settings/serializers/auth/feishu.py:16 -msgid "Enable FeiShu Auth" +msgid "Lark" msgstr "启用飞书认证" #: settings/serializers/auth/ldap.py:39 @@ -5090,7 +5082,7 @@ msgid "LDAP" msgstr "LDAP" #: settings/serializers/auth/ldap.py:42 -msgid "LDAP server" +msgid "Server" msgstr "LDAP 地址" #: settings/serializers/auth/ldap.py:43 @@ -5118,11 +5110,6 @@ msgstr "用户过滤器" msgid "Choice may be (cn|uid|sAMAccountName)=%(user)s)" msgstr "可能的选项是(cn或uid或sAMAccountName=%(user)s)" -#: settings/serializers/auth/ldap.py:58 settings/serializers/auth/oauth2.py:56 -#: settings/serializers/auth/oidc.py:37 -msgid "User attr map" -msgstr "用户属性映射" - #: settings/serializers/auth/ldap.py:59 msgid "" "User attr map present how to map LDAP user attr to jumpserver, username,name," @@ -5139,18 +5126,10 @@ msgstr "连接超时时间 (秒)" msgid "Search paged size (piece)" msgstr "搜索分页数量 (条)" -#: settings/serializers/auth/ldap.py:84 -msgid "Enable LDAP auth" -msgstr "启用 LDAP 认证" - #: settings/serializers/auth/oauth2.py:18 msgid "OAuth2" msgstr "OAuth2" -#: settings/serializers/auth/oauth2.py:21 -msgid "Enable OAuth2 Auth" -msgstr "启用 OAuth2 认证" - #: settings/serializers/auth/oauth2.py:24 msgid "Logo" msgstr "图标" @@ -5193,10 +5172,6 @@ msgstr "注销会话端点地址" msgid "Always update user" msgstr "总是更新用户信息" -#: settings/serializers/auth/oidc.py:12 -msgid "OIDC" -msgstr "OIDC" - #: settings/serializers/auth/oidc.py:16 msgid "Base site URL" msgstr "JumpServer 地址" @@ -5234,7 +5209,7 @@ msgid "Realm name" msgstr "域" #: settings/serializers/auth/oidc.py:63 -msgid "Enable OPENID Auth" +msgid "OIDC" msgstr "启用 OIDC 认证" #: settings/serializers/auth/oidc.py:65 @@ -5273,10 +5248,6 @@ msgstr "使用状态" msgid "Use nonce" msgstr "临时使用" -#: settings/serializers/auth/passkey.py:11 -msgid "Enable passkey Auth" -msgstr "启用 Passkey 认证" - #: settings/serializers/auth/passkey.py:12 msgid "Only SSL domain can use passkey auth" msgstr "只有 SSL 域名可以使用 Passkey(通行密钥)认证" @@ -5301,10 +5272,6 @@ msgstr "Passkey 服务名称" msgid "Radius" msgstr "Radius" -#: settings/serializers/auth/radius.py:15 -msgid "Enable Radius Auth" -msgstr "启用 Radius 认证" - #: settings/serializers/auth/radius.py:21 msgid "OTP in Radius" msgstr "使用 Radius OTP" @@ -5313,10 +5280,6 @@ msgstr "使用 Radius OTP" msgid "SAML2" msgstr "SAML2" -#: settings/serializers/auth/saml2.py:13 -msgid "Enable SAML2 Auth" -msgstr "启用 SAML2 认证" - #: settings/serializers/auth/saml2.py:16 msgid "IDP metadata URL" msgstr "IDP metadata 地址" @@ -5337,10 +5300,6 @@ msgstr "SP 密钥" msgid "SP cert" msgstr "SP 证书" -#: settings/serializers/auth/slack.py:12 -msgid "Enable Slack Auth" -msgstr "启用 Slack 认证" - #: settings/serializers/auth/sms.py:19 msgid "SMS provider / Protocol" msgstr "短信服务商 / 协议" @@ -5432,10 +5391,6 @@ msgstr "令牌有效期" msgid "Unit: second" msgstr "单位: 秒" -#: settings/serializers/auth/wecom.py:15 -msgid "Enable WeCom Auth" -msgstr "启用企业微信认证" - #: settings/serializers/basic.py:11 msgid "Site URL" msgstr "当前站点 URL" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 53c72a2d7..e7e7ef642 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -439,7 +439,7 @@ "FailedAsset": "Failed Assets", "FaviconTip": "Note: Website Icon (Suggested Image Size: 16px*16px)", "Features": "Features", - "FeiShu": "Feishu", + "FeiShu": "Lark", "FeiShuTest": "Test", "FieldRequiredError": "This field is required", "FileManagement": "File management", @@ -1205,7 +1205,7 @@ "VirtualApp": "Virtual App", "VirtualAppDetail": "Virtual App Details", "VirtualApps": "Virtual App", - "WeCom": "WeChat for Business", + "WeCom": "WeCom", "WeComTest": "Test", "WebCreate": "Create Asset-Web", "WebHelpMessage": "Web type assets depend on remote applications, please go to system settings and configure in remote applications", diff --git a/apps/settings/serializers/auth/base.py b/apps/settings/serializers/auth/base.py index b6358c197..41309bc43 100644 --- a/apps/settings/serializers/auth/base.py +++ b/apps/settings/serializers/auth/base.py @@ -26,5 +26,5 @@ class AuthSettingSerializer(serializers.Serializer): label=_("Forgot Password URL") ) LOGIN_REDIRECT_MSG_ENABLED = serializers.BooleanField( - required=False, label=_("Enable login redirect msg") + required=False, label=_("Login redirection prompt") ) diff --git a/apps/settings/serializers/auth/cas.py b/apps/settings/serializers/auth/cas.py index c85497b00..d66dadd7d 100644 --- a/apps/settings/serializers/auth/cas.py +++ b/apps/settings/serializers/auth/cas.py @@ -9,11 +9,11 @@ __all__ = [ class CASSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('CAS') - AUTH_CAS = serializers.BooleanField(required=False, label=_('Enable CAS Auth')) - CAS_SERVER_URL = serializers.CharField(required=False, max_length=1024, label=_('Server url')) + AUTH_CAS = serializers.BooleanField(required=False, label=_('CAS')) + CAS_SERVER_URL = serializers.CharField(required=False, max_length=1024, label=_('Server')) CAS_ROOT_PROXIED_AS = serializers.CharField( required=False, allow_null=True, allow_blank=True, - max_length=1024, label=_('Proxy server url') + max_length=1024, label=_('Proxy Server') ) CAS_LOGOUT_COMPLETELY = serializers.BooleanField(required=False, label=_('Logout completely')) CAS_VERSION = serializers.IntegerField( @@ -25,5 +25,8 @@ class CASSettingSerializer(serializers.Serializer): CAS_APPLY_ATTRIBUTES_TO_USER = serializers.BooleanField( required=False, label=_('Enable attributes map') ) - CAS_RENAME_ATTRIBUTES = serializers.JSONField(required=False, label=_('Rename attr')) - CAS_CREATE_USER = serializers.BooleanField(required=False, label=_('Create user if not')) + CAS_RENAME_ATTRIBUTES = serializers.JSONField(required=False, label=_('User attribute')) + CAS_CREATE_USER = serializers.BooleanField( + required=False, label=_('Create user'), + help_text=_('Automatically create a new user if not found.') + ) diff --git a/apps/settings/serializers/auth/dingtalk.py b/apps/settings/serializers/auth/dingtalk.py index 418693bb8..d4d4b34d7 100644 --- a/apps/settings/serializers/auth/dingtalk.py +++ b/apps/settings/serializers/auth/dingtalk.py @@ -9,7 +9,7 @@ __all__ = ['DingTalkSettingSerializer'] class DingTalkSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('DingTalk') - DINGTALK_AGENTID = serializers.CharField(max_length=256, required=True, label='AgentId') - DINGTALK_APPKEY = serializers.CharField(max_length=256, required=True, label='AppKey') - DINGTALK_APPSECRET = EncryptedField(max_length=256, required=False, label='AppSecret') - AUTH_DINGTALK = serializers.BooleanField(default=False, label=_('Enable DingTalk Auth')) + DINGTALK_AGENTID = serializers.CharField(max_length=256, required=True, label='Agent ID') + DINGTALK_APPKEY = serializers.CharField(max_length=256, required=True, label='App Key') + DINGTALK_APPSECRET = EncryptedField(max_length=256, required=False, label='App Secret') + AUTH_DINGTALK = serializers.BooleanField(default=False, label=_('Dingtalk')) diff --git a/apps/settings/serializers/auth/feishu.py b/apps/settings/serializers/auth/feishu.py index d3c1edcad..d7bb2bc4d 100644 --- a/apps/settings/serializers/auth/feishu.py +++ b/apps/settings/serializers/auth/feishu.py @@ -13,7 +13,7 @@ class FeiShuSettingSerializer(serializers.Serializer): ('feishu', _('FeiShu')), ('lark', 'Lark') ) - AUTH_FEISHU = serializers.BooleanField(default=False, label=_('Enable FeiShu Auth')) + AUTH_FEISHU = serializers.BooleanField(default=False, label=_('Lark')) FEISHU_APP_ID = serializers.CharField(max_length=256, required=True, label='App ID') FEISHU_APP_SECRET = EncryptedField(max_length=256, required=False, label='App Secret') FEISHU_VERSION = serializers.ChoiceField( diff --git a/apps/settings/serializers/auth/ldap.py b/apps/settings/serializers/auth/ldap.py index 7a696db91..4706c9a39 100644 --- a/apps/settings/serializers/auth/ldap.py +++ b/apps/settings/serializers/auth/ldap.py @@ -39,7 +39,7 @@ class LDAPSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('LDAP') AUTH_LDAP_SERVER_URI = serializers.CharField( - required=True, max_length=1024, label=_('LDAP server'), + required=True, max_length=1024, label=_('Server'), help_text=_('eg: ldap://localhost:389') ) AUTH_LDAP_BIND_DN = serializers.CharField(required=False, max_length=1024, label=_('Bind DN')) @@ -55,7 +55,7 @@ class LDAPSettingSerializer(serializers.Serializer): help_text=_('Choice may be (cn|uid|sAMAccountName)=%(user)s)') ) AUTH_LDAP_USER_ATTR_MAP = serializers.JSONField( - required=True, label=_('User attr map'), + required=True, label=_('User attribute'), help_text=_('User attr map present how to map LDAP user attr to ' 'jumpserver, username,name,email is jumpserver attr') ) @@ -81,7 +81,7 @@ class LDAPSettingSerializer(serializers.Serializer): required=False, label=_('Recipient'), max_length=36 ) - AUTH_LDAP = serializers.BooleanField(required=False, label=_('Enable LDAP auth')) + AUTH_LDAP = serializers.BooleanField(required=False, label=_('LDAP')) @staticmethod def post_save(): diff --git a/apps/settings/serializers/auth/oauth2.py b/apps/settings/serializers/auth/oauth2.py index b5a0dbb62..346f66092 100644 --- a/apps/settings/serializers/auth/oauth2.py +++ b/apps/settings/serializers/auth/oauth2.py @@ -18,7 +18,7 @@ class OAuth2SettingSerializer(serializers.Serializer): PREFIX_TITLE = _('OAuth2') AUTH_OAUTH2 = serializers.BooleanField( - default=False, label=_('Enable OAuth2 Auth') + default=False, label=_('OAuth2') ) AUTH_OAUTH2_LOGO_PATH = SettingImageField( allow_null=True, required=False, label=_('Logo') @@ -53,7 +53,7 @@ class OAuth2SettingSerializer(serializers.Serializer): ) AUTH_OAUTH2_LOGOUT_COMPLETELY = serializers.BooleanField(required=False, label=_('Logout completely')) AUTH_OAUTH2_USER_ATTR_MAP = serializers.JSONField( - required=True, label=_('User attr map') + required=True, label=_('User attribute') ) AUTH_OAUTH2_ALWAYS_UPDATE_USER = serializers.BooleanField( default=True, label=_('Always update user') diff --git a/apps/settings/serializers/auth/oidc.py b/apps/settings/serializers/auth/oidc.py index ae0b69b2f..3e594c3c1 100644 --- a/apps/settings/serializers/auth/oidc.py +++ b/apps/settings/serializers/auth/oidc.py @@ -34,7 +34,7 @@ class CommonSettingSerializer(serializers.Serializer): required=False, label=_('Ignore ssl verification') ) AUTH_OPENID_USER_ATTR_MAP = serializers.JSONField( - required=True, label=_('User attr map'), + required=True, label=_('User attribute'), help_text=_('User attr map present how to map OpenID user attr to ' 'jumpserver, username,name,email is jumpserver attr') ) @@ -51,7 +51,7 @@ class KeycloakSettingSerializer(CommonSettingSerializer): label=_("Use Keycloak"), required=False, default=False ) AUTH_OPENID_SERVER_URL = serializers.CharField( - required=False, max_length=1024, label=_('Server url') + required=False, max_length=1024, label=_('Server') ) AUTH_OPENID_REALM_NAME = serializers.CharField( required=False, max_length=1024, allow_null=True, label=_('Realm name') @@ -60,7 +60,7 @@ class KeycloakSettingSerializer(CommonSettingSerializer): class OIDCSettingSerializer(KeycloakSettingSerializer): # OpenID 新配置参数 (version >= 1.5.9) - AUTH_OPENID = serializers.BooleanField(required=False, label=_('Enable OPENID Auth')) + AUTH_OPENID = serializers.BooleanField(required=False, label=_('OIDC')) AUTH_OPENID_PROVIDER_ENDPOINT = serializers.CharField( required=False, max_length=1024, label=_('Provider endpoint') ) diff --git a/apps/settings/serializers/auth/passkey.py b/apps/settings/serializers/auth/passkey.py index 6d65da26b..fc86b1447 100644 --- a/apps/settings/serializers/auth/passkey.py +++ b/apps/settings/serializers/auth/passkey.py @@ -8,7 +8,7 @@ class PasskeySettingSerializer(serializers.Serializer): PREFIX_TITLE = _('Passkey') AUTH_PASSKEY = serializers.BooleanField( - default=False, label=_('Enable passkey Auth'), + default=False, label=_('Passkey'), help_text=_('Only SSL domain can use passkey auth') ) FIDO_SERVER_ID = serializers.CharField( diff --git a/apps/settings/serializers/auth/radius.py b/apps/settings/serializers/auth/radius.py index b4085c352..859f577e4 100644 --- a/apps/settings/serializers/auth/radius.py +++ b/apps/settings/serializers/auth/radius.py @@ -12,7 +12,7 @@ __all__ = ['RadiusSettingSerializer'] class RadiusSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('Radius') - AUTH_RADIUS = serializers.BooleanField(required=False, label=_('Enable Radius Auth')) + AUTH_RADIUS = serializers.BooleanField(required=False, label=_('Radius')) RADIUS_SERVER = serializers.CharField(required=False, allow_blank=True, max_length=1024, label=_('Host')) RADIUS_PORT = serializers.IntegerField(required=False, label=_('Port')) RADIUS_SECRET = EncryptedField( diff --git a/apps/settings/serializers/auth/saml2.py b/apps/settings/serializers/auth/saml2.py index 35a4ef5d5..691d40afc 100644 --- a/apps/settings/serializers/auth/saml2.py +++ b/apps/settings/serializers/auth/saml2.py @@ -10,7 +10,7 @@ class SAML2SettingSerializer(serializers.Serializer): PREFIX_TITLE = _('SAML2') AUTH_SAML2 = serializers.BooleanField( - default=False, required=False, label=_('Enable SAML2 Auth') + default=False, required=False, label=_('SAML2') ) SAML2_IDP_METADATA_URL = serializers.URLField( allow_blank=True, required=False, label=_('IDP metadata URL') @@ -29,6 +29,6 @@ class SAML2SettingSerializer(serializers.Serializer): allow_blank=True, required=False, write_only=True, label=_('SP cert') ) - SAML2_RENAME_ATTRIBUTES = serializers.JSONField(required=False, label=_('Rename attr')) + SAML2_RENAME_ATTRIBUTES = serializers.JSONField(required=False, label=_('User attribute')) SAML2_LOGOUT_COMPLETELY = serializers.BooleanField(required=False, label=_('Logout completely')) AUTH_SAML2_ALWAYS_UPDATE_USER = serializers.BooleanField(required=False, label=_('Always update user')) diff --git a/apps/settings/serializers/auth/slack.py b/apps/settings/serializers/auth/slack.py index 019137f4c..244fd2cbd 100644 --- a/apps/settings/serializers/auth/slack.py +++ b/apps/settings/serializers/auth/slack.py @@ -9,7 +9,7 @@ __all__ = ['SlackSettingSerializer'] class SlackSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('Slack') - AUTH_SLACK = serializers.BooleanField(default=False, label=_('Enable Slack Auth')) + AUTH_SLACK = serializers.BooleanField(default=False, label=_('Slack')) SLACK_CLIENT_ID = serializers.CharField(max_length=256, required=True, label='Client ID') SLACK_CLIENT_SECRET = EncryptedField(max_length=256, required=False, label='Client Secret') SLACK_BOT_TOKEN = EncryptedField(max_length=256, required=False, label='Client bot Token') diff --git a/apps/settings/serializers/auth/wecom.py b/apps/settings/serializers/auth/wecom.py index b296eb691..74ef3402f 100644 --- a/apps/settings/serializers/auth/wecom.py +++ b/apps/settings/serializers/auth/wecom.py @@ -12,4 +12,4 @@ class WeComSettingSerializer(serializers.Serializer): WECOM_CORPID = serializers.CharField(max_length=256, required=True, label='corpid') WECOM_AGENTID = serializers.CharField(max_length=256, required=True, label='agentid') WECOM_SECRET = EncryptedField(max_length=256, required=False, label='secret') - AUTH_WECOM = serializers.BooleanField(default=False, label=_('Enable WeCom Auth')) + AUTH_WECOM = serializers.BooleanField(default=False, label=_('WeCom'))