From 251db733b2e98bb98cceebbd62da38f56b00bf1f Mon Sep 17 00:00:00 2001 From: wangruidong <940853815@qq.com> Date: Wed, 21 Feb 2024 18:51:13 +0800 Subject: [PATCH 01/17] perf: i18n modify --- apps/i18n/lina/en.json | 23 ++++++++++++----------- apps/i18n/lina/zh.json | 1 + 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index c1b233405..9de295527 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -145,7 +145,7 @@ "Assignees": "Pending Handler", "AttrName": "Attribute Name", "AttrValue": "Attribute value", - "Audits": "Audit Console", + "Audits": "Audit", "Auth": "Authentication", "AuthLimit": "Login Restrictions", "AuthSAMLCertHelpText": "Save after uploading the certificate key, then view SP Metadata", @@ -257,7 +257,7 @@ "CommandGroupUpdate": "Update Command Group", "CommandStorage": "Command Storage", "CommandStorageUpdate": "Update Cmd Storage", - "Commands": "Command Record", + "Commands": "Command Records", "Comment": "Note", "CommentHelpText": "Note: Remarks will be displayed when hovered over in the Luna page's user authorization asset tree. Ordinary users can view, please do not fill in sensitive information.", "CommunityEdition": "Community Version", @@ -344,7 +344,7 @@ "DateSync": "Sync Date", "DateUpdated": "Update Date", "Day": "Day", - "DeclassificationLogNum": "Change Password Log Count", + "DeclassificationLogNum": "Password Change Logs", "DefaultDatabase": "Default Database", "DefaultPort": "Default Port", "Delete": "Delete", @@ -386,6 +386,7 @@ "DownloadReplay": "Download Recording", "DownloadUpdateTemplateMsg": "Download Update Template", "DragUploadFileInfo": "Drag files here, or click here to upload", + "Duration": "Duration", "DuplicateFileExists": "Uploading a file with the same name is not allowed, please delete the file with the same name", "DynamicUsername": "Dynamic Username", "Edit": "Edit", @@ -558,7 +559,7 @@ "JobCenter": "Task Center", "JobCreate": "Create Job", "JobDetail": "Job Details", - "JobExecutionLog": "Job Log", + "JobExecutionLog": "Job Logs", "JobList": "Job", "JobUpdate": "Update Job", "KingSoftCloud": "Kingsoft Cloud", @@ -603,7 +604,7 @@ "LoginFailed": "Login Failed", "LoginFrom": "Login Source", "LoginImageTip": "Note: It will appear on the enterprise user login page (recommended image size: 492*472px)", - "LoginLog": "Login Log", + "LoginLog": "Login Logs", "LoginNum": "Login Count", "LoginPasswordSetting": "Login Password Settings", "LoginRequiredMsg": "The account has logged out, please log in again.", @@ -615,7 +616,7 @@ "LogoIndexTip": "Tip: It will be displayed in the upper left corner of the page (Recommended image size: 185px*55px)", "LogoLogoutTip": "Tip: It will be displayed on the web terminal page of Enterprise Edition users (recommended image size: 82px*82px)", "Logout": "Logout", - "LogsAudit": "Log auditing", + "LogsAudit": "Log audit", "Lowercase": "Lowercase", "LunaSettingUpdate": "Luna Configuration Settings", "MFAErrorMsg": "MFA errors, please check", @@ -702,7 +703,7 @@ "OneClickReadMsg": "Are you sure you want to mark the current information as read?", "OnlineSession": "Online users", "OnlineSessionHelpMsg": "Unable to log out of the current session because it is the current user's online session. Currently only users logged in via Web are being logged.", - "OnlineSessions": "Online Sessions Number", + "OnlineSessions": "Online Sessions Count", "OnlineUserDevices": "Online User Devices", "OnlyMailSend": "Current support for email sending", "OnlySearchCurrentNodePerm": "Only Search the Current Node's Authorization", @@ -710,7 +711,7 @@ "OpenStack": "OpenStack", "OpenStatus": "In Approval", "OpenTicket": "Create a Ticket", - "OperateLog": "Operation Log", + "OperateLog": "Operation Logs", "OperationLogNum": "Operation Logs", "OrgAdmin": "Organization Admin", "OrgAuditor": "Org Auditors", @@ -736,7 +737,7 @@ "PasskeyAddDisableInfo": "Your authentication source is {source}, and adding a Passkey is not supported", "Passphrase": "Key Password", "Password": "Password", - "PasswordChangeLog": "Password Change Log", + "PasswordChangeLog": "Password Change Logs", "PasswordExpired": "Password Expired", "PasswordPlaceholder": "Please Enter Password", "PasswordRecord": "Password Record", @@ -964,10 +965,10 @@ "SessionData": "Session Data", "SessionDetail": "Session Details", "SessionID": "Session ID", - "SessionList": "Conversation History", + "SessionList": "Session Records", "SessionMonitor": "Monitor", "SessionOffline": "Historical Sessions", - "SessionOnline": "Online Session", + "SessionOnline": "Online Sessions", "SessionSecurity": "Session security", "SessionState": "Session Status", "SessionTerminate": "Session Termination", diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index 50a2a3f58..bca892e27 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -383,6 +383,7 @@ "DownloadUpdateTemplateMsg": "下载更新模板", "DragUploadFileInfo": "将文件拖到此处，或点击此处上传", "DuplicateFileExists": "不允许上传同名文件,请删除同名文件", + "Duration": "时长", "DynamicUsername": "动态用户名", "Edit": "编辑", "Edition": "版本", From 71b6fd53268d412148320ce69b673d1c243a5cfa Mon Sep 17 00:00:00 2001 From: Bai Date: Thu, 22 Feb 2024 17:09:02 +0800 Subject: [PATCH 02/17] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/i18n/lina/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 9de295527..adb3a95fc 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -685,7 +685,7 @@ "NotSet": "Not Set", "NotSpecialEmoji": "Special Emoji Input Not Allowed", "Nothing": "None", - "Notifications": "Notification", + "Notifications": "Notifications", "Now": "Now", "Number": "Number", "NumberOfVisits": "Visits", From 430f45a3ec3f447cb3765fe65578a7b4eee6d745 Mon Sep 17 00:00:00 2001 From: wangruidong <940853815@qq.com> Date: Thu, 22 Feb 2024 14:25:14 +0800 Subject: [PATCH 03/17] perf: permissions i18n modify --- apps/i18n/lina/en.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index adb3a95fc..ce8ef3bd5 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -112,7 +112,7 @@ "AssetAccountDetail": "Account Details", "AssetAclCreate": "Create Asset Connect Rule", "AssetAclDetail": "Asset Connect Rule Details", - "AssetAclList": "Asset Connect", + "AssetAclList": "Asset Connect ACL", "AssetAclUpdate": "Update Asset Connect Rules", "AssetAddress": "Asset (IP/Hostname)", "AssetAmount": "Assets", @@ -127,7 +127,7 @@ "AssetListHelpMessage": "On the left is the asset tree. Right-click to create, delete or modify tree nodes. Assets are also organized in node form. On the right are the assets under this node. \n", "AssetLoginACLHelpMsg": "When logging into assets, it can be audited based on the user's login IP and time segment to determine whether the assets can be logged into", "AssetName": "Asset Name", - "AssetPermission": "Authorization", + "AssetPermission": "Asset Authorization", "AssetPermissionCreate": "Create Asset Authorization Rule", "AssetPermissionDetail": "Asset Authorization Details", "AssetPermissionHelpMsg": "Asset authorization allows you to select users and assets, grant the assets to users for access. Once completed, users can conveniently view these assets. Additionally, you can set specific permissions to further define the users' rights to the assets.", @@ -246,7 +246,7 @@ "CommandFilterACLHelpMsg": "By filtering commands, you can control if commands can be sent to assets. Based on your set rules, some commands can be allowed while others are prohibited.", "CommandFilterAclCreate": "Create Command Filter Rule", "CommandFilterAclDetail": "Details of Command Filter Rule", - "CommandFilterAclList": "Command Filter", + "CommandFilterAclList": "Command Filter ACL", "CommandFilterAclUpdate": "Update Command Filter Rule", "CommandFilterRuleContentHelpText": "One command per line", "CommandFilterRules": "Command Filter Rules", @@ -272,7 +272,7 @@ "ConnectMethodACLHelpMsg": "Connect Methods can be filtered to control whether users can use a certain Connect Method to log in to the asset. According to your set rules, some Connect Methods can be allowed, while others can be prohibited (globally effective).", "ConnectMethodAclCreate": "Create Connect Method Control", "ConnectMethodAclDetail": "Connect Method Control Details", - "ConnectMethodAclList": "Connect Method", + "ConnectMethodAclList": "Connect Method ACL", "ConnectMethodAclUpdate": "Update Connect Method Control", "ConnectWebSocketError": "Connection to WebSocket Failed", "ConnectionDropped": "Connection Disconnected", @@ -639,7 +639,7 @@ "MenuAcls": "ACLs", "MenuAssets": "Assets", "MenuMore": "Others", - "MenuPermissions": "Policies", + "MenuPermissions": "Permissions", "MenuUsers": "Users", "Message": "Message", "MessageSubscription": "Message Subscription", @@ -1171,7 +1171,7 @@ "UserLoginACLHelpMsg": "When logging into the system, the user's login IP and time range can be audited to determine whether they are allowed to log into the system (effective globally)", "UserLoginAclCreate": "Create User Login Control", "UserLoginAclDetail": "User Login Control Details", - "UserLoginAclList": "User Login", + "UserLoginAclList": "User Login ACL", "UserLoginAclUpdate": "Update User Login Control", "UserLoginLimit": "User Login Restriction", "UserLoginTrend": "Account Login Trend", From 35448eea9fdda7c22001a08d760cab25972bbde1 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Thu, 22 Feb 2024 17:46:12 +0800 Subject: [PATCH 04/17] =?UTF-8?q?perf:=20=E7=BF=BB=E8=AF=91=20(#12690)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> --- .../migrations/0005_auto_20190228_1715.py | 2 +- .../migrations/0023_auto_20230906_1322.py | 2 +- apps/audits/models.py | 2 +- .../authentication/_msg_different_city.html | 2 +- apps/i18n/core/en/LC_MESSAGES/django.mo | 4 +- apps/i18n/core/en/LC_MESSAGES/django.po | 49 +++++-------------- apps/i18n/core/ja/LC_MESSAGES/django.mo | 4 +- apps/i18n/core/ja/LC_MESSAGES/django.po | 32 ++++-------- apps/i18n/core/zh/LC_MESSAGES/django.mo | 4 +- apps/i18n/core/zh/LC_MESSAGES/django.po | 37 +++++--------- apps/i18n/lina/en.json | 13 +++-- apps/i18n/lina/zh.json | 9 ++-- apps/labels/serializers.py | 2 +- .../migrations/0016_auto_20220609_1758.py | 2 +- apps/tickets/models/ticket/login_confirm.py | 2 +- apps/users/migrations/0001_initial.py | 2 +- 16 files changed, 57 insertions(+), 111 deletions(-) diff --git a/apps/audits/migrations/0005_auto_20190228_1715.py b/apps/audits/migrations/0005_auto_20190228_1715.py index aac747e9b..910644526 100644 --- a/apps/audits/migrations/0005_auto_20190228_1715.py +++ b/apps/audits/migrations/0005_auto_20190228_1715.py @@ -42,7 +42,7 @@ class Migration(migrations.Migration): default=True, max_length=2, verbose_name='Status')), ('datetime', models.DateTimeField(default=django.utils.timezone.now, - verbose_name='Date login')), + verbose_name='Login Date')), ], options={ 'ordering': ['-datetime', 'username'], diff --git a/apps/audits/migrations/0023_auto_20230906_1322.py b/apps/audits/migrations/0023_auto_20230906_1322.py index 34998318c..34928eef6 100644 --- a/apps/audits/migrations/0023_auto_20230906_1322.py +++ b/apps/audits/migrations/0023_auto_20230906_1322.py @@ -24,6 +24,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='userloginlog', name='datetime', - field=models.DateTimeField(db_index=True, default=django.utils.timezone.now, verbose_name='Date login'), + field=models.DateTimeField(db_index=True, default=django.utils.timezone.now, verbose_name='Login Date'), ), ] diff --git a/apps/audits/models.py b/apps/audits/models.py index c4b4486a5..646f63aef 100644 --- a/apps/audits/models.py +++ b/apps/audits/models.py @@ -207,7 +207,7 @@ class UserLoginLog(models.Model): choices=LoginStatusChoices.choices, verbose_name=_("Status"), ) - datetime = models.DateTimeField(default=timezone.now, verbose_name=_("Date login"), db_index=True) + datetime = models.DateTimeField(default=timezone.now, verbose_name=_("Login Date"), db_index=True) backend = models.CharField( max_length=32, default="", verbose_name=_("Authentication backend") ) diff --git a/apps/authentication/templates/authentication/_msg_different_city.html b/apps/authentication/templates/authentication/_msg_different_city.html index 02dbf4271..b3ca09432 100644 --- a/apps/authentication/templates/authentication/_msg_different_city.html +++ b/apps/authentication/templates/authentication/_msg_different_city.html @@ -7,7 +7,7 @@

{% trans 'Username' %}: {{ username }}
- {% trans 'Login time' %}: {{ time }}
+ {% trans 'Login Date' %}: {{ time }}
{% trans 'Login city' %}: {{ city }}({{ ip }})

diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo index 455e3bc71..7042cc815 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:0f38416ee042bf98512fadd5dc339c7476f1c40c99f8e4fd4fa6834c894c4345 -size 1398 +oid sha256:d192f1809f7eec4c976f6c0734985eeae75d66965ddd73cd870aaa70000ba9c5 +size 1665 diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index d0d817901..b777d1321 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-20 15:15+0800\n" +"POT-Creation-Date: 2024-02-22 17:43+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -404,7 +404,7 @@ msgstr "" #: accounts/serializers/automations/change_secret.py:128 #: ops/serializers/job.py:67 terminal/serializers/session.py:49 msgid "Is success" -msgstr "Success" +msgstr "Is success" #: accounts/models/automations/backup_account.py:143 msgid "Account backup execution" @@ -540,10 +540,8 @@ msgid "Gather account automation" msgstr "" #: accounts/models/automations/gather_account.py:56 -#, fuzzy -#| msgid "Sync account" msgid "Is sync account" -msgstr "Sync account" +msgstr "Is sync account" #: accounts/models/automations/gather_account.py:75 #: accounts/tasks/gather_accounts.py:29 @@ -974,8 +972,6 @@ msgstr "" #: common/const/choices.py:18 ops/const.py:73 ops/serializers/celery.py:48 #: terminal/const.py:78 terminal/models/session/sharing.py:121 #: tickets/views/approve.py:117 -#, fuzzy -#| msgid "Is success" msgid "Success" msgstr "Success" @@ -2501,7 +2497,9 @@ msgid "MFA" msgstr "" #: audits/models.py:210 -msgid "Date login" +#: authentication/templates/authentication/_msg_different_city.html:10 +#: tickets/models/ticket/login_confirm.py:12 +msgid "Login Date" msgstr "" #: audits/models.py:212 audits/models.py:266 audits/serializers.py:70 @@ -3192,10 +3190,8 @@ msgstr "" #: authentication/serializers/token.py:92 perms/serializers/permission.py:43 #: perms/serializers/permission.py:66 users/serializers/user.py:98 #: users/serializers/user.py:174 -#, fuzzy -#| msgid "Valid" msgid "Is valid" -msgstr "Valid" +msgstr "Is Valid" #: authentication/tasks.py:11 msgid "Clean expired session" @@ -3278,10 +3274,6 @@ msgstr "" msgid "Your account has remote login behavior, please pay attention" msgstr "" -#: authentication/templates/authentication/_msg_different_city.html:10 -msgid "Login time" -msgstr "" - #: authentication/templates/authentication/_msg_different_city.html:16 msgid "" "If you suspect that the login behavior is abnormal, please modify the " @@ -3937,10 +3929,8 @@ msgid "Labeled resource" msgstr "" #: labels/serializers.py:22 -#, fuzzy -#| msgid "Executed amount" -msgid "Resource amount" -msgstr "Executions" +msgid "Resource count" +msgstr "Resource count" #: labels/serializers.py:28 msgid "Cannot contain \":,\"" @@ -7110,10 +7100,8 @@ msgid "Online sessions" msgstr "" #: terminal/serializers/terminal.py:43 -#, fuzzy -#| msgid "Alive" msgid "Is alive" -msgstr "Alive" +msgstr "Is alive" #: terminal/serializers/terminal.py:49 msgid "Stat" @@ -7413,10 +7401,6 @@ msgstr "" msgid "Apply Login Asset Ticket" msgstr "" -#: tickets/models/ticket/login_confirm.py:12 -msgid "Login datetime" -msgstr "" - #: tickets/models/ticket/login_confirm.py:15 msgid "Apply Login Ticket" msgstr "" @@ -7689,10 +7673,8 @@ msgid "Force enable" msgstr "" #: users/models/user.py:812 users/serializers/user.py:175 -#, fuzzy -#| msgid "Service account" msgid "Is service account" -msgstr "Service account" +msgstr "Is service account" #: users/models/user.py:814 msgid "Avatar" @@ -8862,7 +8844,6 @@ msgid "Logo of logout page" msgstr "" #: xpack/plugins/interface/models.py:41 -#: xpack/plugins/interface/serializers/interface.py:26 msgid "Theme" msgstr "" @@ -8878,14 +8859,6 @@ msgstr "" msgid "Interface setting" msgstr "" -#: xpack/plugins/interface/serializers/interface.py:37 -msgid "Wide logo on top" -msgstr "" - -#: xpack/plugins/interface/serializers/interface.py:38 -msgid "Small logo without text" -msgstr "" - #: xpack/plugins/license/api.py:52 msgid "License import successfully" msgstr "" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index 7402d6e0a..9d0077e5a 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:89339329adfc787fe38cd62cc18caf7adfe5824fa7bbddcb7d69598521a18d18 -size 170670 +oid sha256:1b64a2cb215d6258ede3d9794241a80d7104690075054ad966e649834e49910f +size 170574 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index e7f00effd..d056b5c41 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-20 15:15+0800\n" +"POT-Creation-Date: 2024-02-22 17:42+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2550,7 +2550,9 @@ msgid "MFA" msgstr "MFA" #: audits/models.py:210 -msgid "Date login" +#: authentication/templates/authentication/_msg_different_city.html:10 +#: tickets/models/ticket/login_confirm.py:12 +msgid "Login Date" msgstr "日付ログイン" #: audits/models.py:212 audits/models.py:266 audits/serializers.py:70 @@ -3345,10 +3347,6 @@ msgstr "こんにちは" msgid "Your account has remote login behavior, please pay attention" msgstr "アカウントにリモートログイン動作があります。注意してください" -#: authentication/templates/authentication/_msg_different_city.html:10 -msgid "Login time" -msgstr "ログイン時間" - #: authentication/templates/authentication/_msg_different_city.html:16 msgid "" "If you suspect that the login behavior is abnormal, please modify the " @@ -4036,9 +4034,9 @@ msgstr "関連リソース" #: labels/serializers.py:22 #, fuzzy -#| msgid "Resource count" -msgid "Resource amount" -msgstr "リソース数" +#| msgid "Resource type" +msgid "Resource count" +msgstr "リソースタイプ" #: labels/serializers.py:28 msgid "Cannot contain \":,\"" @@ -7686,10 +7684,6 @@ msgstr "ログインアカウント" msgid "Apply Login Asset Ticket" msgstr "資産ログインレビュー製造オーダ" -#: tickets/models/ticket/login_confirm.py:12 -msgid "Login datetime" -msgstr "ログイン日時" - #: tickets/models/ticket/login_confirm.py:15 msgid "Apply Login Ticket" msgstr "ユーザーログインレビュー製造オーダ" @@ -9180,7 +9174,6 @@ msgid "Logo of logout page" msgstr "ログアウトページのロゴ" #: xpack/plugins/interface/models.py:41 -#: xpack/plugins/interface/serializers/interface.py:26 msgid "Theme" msgstr "テーマ" @@ -9196,14 +9189,6 @@ msgstr "公安網登録番号" msgid "Interface setting" msgstr "インターフェイスの設定" -#: xpack/plugins/interface/serializers/interface.py:37 -msgid "Wide logo on top" -msgstr "" - -#: xpack/plugins/interface/serializers/interface.py:38 -msgid "Small logo without text" -msgstr "" - #: xpack/plugins/license/api.py:52 msgid "License import successfully" msgstr "ライセンスのインポートに成功" @@ -9232,6 +9217,9 @@ msgstr "エンタープライズプロフェッショナル版" msgid "Ultimate edition" msgstr "エンタープライズ・フラッグシップ・エディション" +#~ msgid "Login time" +#~ msgstr "ログイン時間" + #~ msgid "SMTP port" #~ msgstr "SMTPポート" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index fbeaaf9d6..280765547 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:c0874d399c18f41aa406ea85ee8eaf60fb870eadcd31ed7f1d9a70c10e83240e -size 141057 +oid sha256:048f6988bf37dd7b1c8d20d052009187fbb76548ea3608bb9704880f2dd28eef +size 140998 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 611d916bd..36877af6b 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/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: 2024-02-20 15:15+0800\n" +"POT-Creation-Date: 2024-02-22 17:43+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -2523,7 +2523,9 @@ msgid "MFA" msgstr "MFA" #: audits/models.py:210 -msgid "Date login" +#: authentication/templates/authentication/_msg_different_city.html:10 +#: tickets/models/ticket/login_confirm.py:12 +msgid "Login Date" msgstr "登录日期" #: audits/models.py:212 audits/models.py:266 audits/serializers.py:70 @@ -3301,10 +3303,6 @@ msgstr "你好" msgid "Your account has remote login behavior, please pay attention" msgstr "你的账号存在异地登录行为，请关注。" -#: authentication/templates/authentication/_msg_different_city.html:10 -msgid "Login time" -msgstr "登录日期" - #: authentication/templates/authentication/_msg_different_city.html:16 msgid "" "If you suspect that the login behavior is abnormal, please modify the " @@ -3972,9 +3970,7 @@ msgid "Labeled resource" msgstr "关联的资源" #: labels/serializers.py:22 -#, fuzzy -#| msgid "Resource count" -msgid "Resource amount" +msgid "Resource count" msgstr "资源数量" #: labels/serializers.py:28 @@ -4973,10 +4969,8 @@ msgid "Chat prompt" msgstr "聊天提示" #: settings/notifications.py:23 -#, fuzzy -#| msgid "Notification of account backup route task results" msgid "Notification of Synchronized LDAP User Task Results" -msgstr "账号备份任务结果通知" +msgstr "同步 LDAP 用户任务结果的通知" #: settings/serializers/auth/base.py:10 msgid "Authentication" @@ -7521,10 +7515,6 @@ msgstr "登录账号" msgid "Apply Login Asset Ticket" msgstr "资产登录复核工单" -#: tickets/models/ticket/login_confirm.py:12 -msgid "Login datetime" -msgstr "登录日期" - #: tickets/models/ticket/login_confirm.py:15 msgid "Apply Login Ticket" msgstr "用户登录复核工单" @@ -8986,7 +8976,6 @@ msgid "Logo of logout page" msgstr "退出页面 Logo" #: xpack/plugins/interface/models.py:41 -#: xpack/plugins/interface/serializers/interface.py:26 msgid "Theme" msgstr "主题" @@ -9002,14 +8991,6 @@ msgstr "公安联网备案号" msgid "Interface setting" msgstr "界面设置" -#: xpack/plugins/interface/serializers/interface.py:37 -msgid "Wide logo on top" -msgstr "顶部宽 Logo" - -#: xpack/plugins/interface/serializers/interface.py:38 -msgid "Small logo without text" -msgstr "方形小 Logo" - #: xpack/plugins/license/api.py:52 msgid "License import successfully" msgstr "许可证导入成功" @@ -9038,6 +9019,12 @@ msgstr "企业专业版" msgid "Ultimate edition" msgstr "企业旗舰版" +#~ msgid "Wide logo on top" +#~ msgstr "顶部宽 Logo" + +#~ msgid "Small logo without text" +#~ msgstr "方形小 Logo" + #~ msgid "Password can not contains `{{` or `}}`" #~ msgstr "密码不能包含 `{{` 或 `}}` 字符" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index ce8ef3bd5..69c901150 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -139,8 +139,7 @@ "AssetsAmount": "Asset", "AssetsTotal": "Asset Total", "AssignedInfo": "Approval Information", - "AssignedMe": "Pending My Approval", - "AssignedTicketList": "Pending My Approval", + "AwaitingMyApproval": "Awaiting my approval", "Assignee": "Handler", "Assignees": "Pending Handler", "AttrName": "Attribute Name", @@ -190,8 +189,8 @@ "BulkOffline": "Batch Offline", "BulkSyncDelete": "Bulk Sync Delete", "BulkSyncErrorMsg": "Bulk Synchronization Failed:", - "BulkTransfer": "Batch Transfer", - "BulkUnblock": "Batch Unlock", + "BulkTransfer": "Bulk Transfer", + "BulkUnblock": "Bulk Unlock", "BulkUpdatePlatformHelpText": "Updates will only be performed when the original platform type of the asset is the same as the selected platform type. If the platform type is different before and after the update, it will not be updated.", "CACertificate": "CA Certificate", "CAS": "CAS", @@ -443,7 +442,7 @@ "FeiShu": "Feishu", "FeiShuTest": "Test", "FieldRequiredError": "This field is required", - "FileManager": "File", + "FileManagement": "File management", "FileNameTooLong": "Filename too long", "FileSizeExceedsLimit": "File size exceeds limit\"", "FileTransfer": "File Transfer", @@ -560,7 +559,7 @@ "JobCreate": "Create Job", "JobDetail": "Job Details", "JobExecutionLog": "Job Logs", - "JobList": "Job", + "JobManagement": "Job Management", "JobUpdate": "Update Job", "KingSoftCloud": "Kingsoft Cloud", "KokoSettingUpdate": "Koko Configuration Settings", @@ -1068,7 +1067,7 @@ "TaskMonitor": "Task Monitoring", "TechnologyConsult": "Technical Consultation", "TempPassword": "The temporary password is valid for 300 seconds and becomes invalid immediately after use", - "Template": "Template", + "TemplateManagement": "Template Management", "TemplateAdd": "Add from template", "TemplateCreate": "Create Template", "TemplateHelpText": "When selecting a template to add, accounts that do not exist under the asset will be automatically created and pushed", diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index bca892e27..3a4c18879 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -137,8 +137,7 @@ "AssetsAmount": "资产", "AssetsTotal": "资产总数", "AssignedInfo": "审批信息", - "AssignedMe": "待我审批", - "AssignedTicketList": "待我审批", + "AwaitingMyApproval": "待我审批", "Assignee": "处理人", "Assignees": "待处理人", "AttrName": "属性名", @@ -439,7 +438,7 @@ "FeiShu": "飞书", "FeiShuTest": "测试", "FieldRequiredError": "此字段是必填项", - "FileManager": "文件管理", + "FileManagement": "文件管理", "FileNameTooLong": "文件名太长", "FileSizeExceedsLimit": "文件大小超出限制", "FileTransfer": "文件传输", @@ -555,7 +554,7 @@ "JobCreate": "创建作业", "JobDetail": "作业详情", "JobExecutionLog": "作业日志", - "JobList": "作业管理", + "JobManagement": "作业管理", "JobUpdate": "更新作业", "KingSoftCloud": "金山云", "KokoSettingUpdate": "Koko 配置设置", @@ -1060,7 +1059,7 @@ "TaskMonitor": "任务监控", "TechnologyConsult": "技术咨询", "TempPassword": "临时密码有效期为 300 秒，使用后立刻失效", - "Template": "模版管理", + "TemplateManagement": "模版管理", "TemplateAdd": "模版添加", "TemplateCreate": "创建模版", "TemplateHelpText": "选择模版添加时，会自动创建资产下不存在的账号并推送", diff --git a/apps/labels/serializers.py b/apps/labels/serializers.py index ace8ab2cf..62abc1bc8 100644 --- a/apps/labels/serializers.py +++ b/apps/labels/serializers.py @@ -19,7 +19,7 @@ class LabelSerializer(BulkOrgResourceModelSerializer): ] read_only_fields = ('date_created', 'date_updated', 'res_count') extra_kwargs = { - 'res_count': {'label': _('Resource amount')}, + 'res_count': {'label': _('Resource count')}, } @staticmethod diff --git a/apps/tickets/migrations/0016_auto_20220609_1758.py b/apps/tickets/migrations/0016_auto_20220609_1758.py index d7f079e5d..51ab30cc9 100644 --- a/apps/tickets/migrations/0016_auto_20220609_1758.py +++ b/apps/tickets/migrations/0016_auto_20220609_1758.py @@ -23,7 +23,7 @@ class Migration(migrations.Migration): primary_key=True, serialize=False, to='tickets.ticket')), ('apply_login_ip', models.GenericIPAddressField(null=True, verbose_name='Login IP')), ('apply_login_city', models.CharField(max_length=64, null=True, verbose_name='Login city')), - ('apply_login_datetime', models.DateTimeField(null=True, verbose_name='Login datetime')), + ('apply_login_datetime', models.DateTimeField(null=True, verbose_name='Login Date')), ], options={ 'abstract': False, diff --git a/apps/tickets/models/ticket/login_confirm.py b/apps/tickets/models/ticket/login_confirm.py index 7b17dd1f8..1f22bbca5 100644 --- a/apps/tickets/models/ticket/login_confirm.py +++ b/apps/tickets/models/ticket/login_confirm.py @@ -9,7 +9,7 @@ __all__ = ['ApplyLoginTicket'] class ApplyLoginTicket(Ticket): apply_login_ip = models.GenericIPAddressField(verbose_name=_('Login IP'), null=True) apply_login_city = models.CharField(max_length=64, verbose_name=_('Login city'), null=True) - apply_login_datetime = models.DateTimeField(verbose_name=_('Login datetime'), null=True) + apply_login_datetime = models.DateTimeField(verbose_name=_('Login Date'), null=True) class Meta: verbose_name = _('Apply Login Ticket') diff --git a/apps/users/migrations/0001_initial.py b/apps/users/migrations/0001_initial.py index 5c0f28a38..b4205d231 100644 --- a/apps/users/migrations/0001_initial.py +++ b/apps/users/migrations/0001_initial.py @@ -100,7 +100,7 @@ class Migration(migrations.Migration): ('ip', models.GenericIPAddressField(verbose_name='Login IP')), ('city', models.CharField(blank=True, max_length=254, null=True, verbose_name='Login city')), ('user_agent', models.CharField(blank=True, max_length=254, null=True, verbose_name='User agent')), - ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date login')), + ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Login Date')), ], options={ 'ordering': ['-datetime', 'username'], From c0e4065a453eea0928567777312826e429f8b700 Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 23 Feb 2024 14:31:09 +0800 Subject: [PATCH 05/17] perf: i18n settings-basic done. --- apps/i18n/core/en/LC_MESSAGES/django.mo | 4 ++-- apps/i18n/core/en/LC_MESSAGES/django.po | 6 ++++-- apps/i18n/lina/en.json | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo index 7042cc815..fe64a9fbf 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:d192f1809f7eec4c976f6c0734985eeae75d66965ddd73cd870aaa70000ba9c5 -size 1665 +oid sha256:970158849c0adeba85da98a2f1e45bd75f963764fb05f6ac1ccdcd19c68f2c6a +size 2025 diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index b777d1321..bb78247f4 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -5387,6 +5387,8 @@ msgid "" "External URL, email links or other system callbacks are used to access it, " "eg: http://dev.jumpserver.org:8080" msgstr "" +"Site URL are commonly used in emails sent or as callback addresses for external systems. " +"eg: http://dev.jumpserver.org:8080" #: settings/serializers/basic.py:18 msgid "User guide url" @@ -5406,7 +5408,7 @@ msgstr "" #: settings/serializers/basic.py:26 msgid "Help Docs URL" -msgstr "" +msgstr "Document URL" #: settings/serializers/basic.py:27 msgid "default: http://docs.jumpserver.org" @@ -5414,7 +5416,7 @@ msgstr "" #: settings/serializers/basic.py:30 msgid "Help Support URL" -msgstr "" +msgstr "Support URL" #: settings/serializers/basic.py:31 msgid "default: http://www.jumpserver.org/support/" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 69c901150..3faff8632 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -166,7 +166,7 @@ "BaiduCloud": "Baidu Cloud", "BasePort": "Listening Ports", "Basic": "Basic", - "BasicInfo": "Basic Info", + "BasicInfo": "Basic", "BasicSetting": "Basic", "BatchConsent": "Batch Approval", "BatchProcessing": "{Number} items selected", @@ -482,8 +482,8 @@ "HardwareInfo": "Hardware Information", "HasImportErrorItemMsg": "There are import failures, click on the left x to view the failure reasons, after editing the table, you can continue to import failures.", "Help": "Help", - "HelpDocumentTip": "You can change the URL of the website navigation bar Help -> Documentation", - "HelpSupportTip": "Can Change the URL of Help -> Support in Website Navigation Bar", + "HelpDocumentTip": "Document URL for navigation bar 'Help -> Document' redirection.", + "HelpSupportTip": "Support URL for the navigation bar 'Help -> Support' redirection.", "HighLoad": "Higher", "HistoricalSessionNum": "Historical Session Count", "History": "History Record", @@ -657,7 +657,7 @@ "MyAssets": "My Assets", "MyTickets": "I Initiated", "Name": "Name", - "NavHelp": "Navigation Bar Link", + "NavHelp": "Navigation", "NeedReLogin": "Need to Re-Login", "New": "Create", "NewChat": "New Chat", From 7c5e2ae8ea0150ade979b8325037b56f3dc437bc Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 23 Feb 2024 15:17:17 +0800 Subject: [PATCH 06/17] perf: i18n settings-org done. --- apps/i18n/lina/en.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 3faff8632..654009caf 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -476,7 +476,7 @@ "Goto": "Go to", "GrantedAssets": "Authorized Assets", "GreatEqualThan": "Greater than or Equal to", - "GroupsAmount": "User Group", + "GroupsAmount": "User group", "HandleTicket": "Handle Work Orders", "Hardware": "Hardware Information", "HardwareInfo": "Hardware Information", @@ -1220,5 +1220,6 @@ "Workbench": "Workspace", "Workspace": "Workspace", "Yes": "Yes", - "ZStack": "ZStack" + "ZStack": "ZStack", + "AssetPermsAmount": "Asset authorization" } From b1fa870de7c6dca87ee1eee6b49fda7c2de93a24 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Fri, 23 Feb 2024 17:22:47 +0800 Subject: [PATCH 07/17] =?UTF-8?q?perf:=20=E5=B7=A5=E4=BD=9C=E5=8F=B0?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=BF=BB=E8=AF=91=20(#12700)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com> --- apps/i18n/core/en/LC_MESSAGES/django.mo | 2 +- apps/i18n/core/en/LC_MESSAGES/django.po | 6 +++--- apps/i18n/core/ja/LC_MESSAGES/django.mo | 4 ++-- apps/i18n/core/ja/LC_MESSAGES/django.po | 6 ++++-- apps/i18n/core/zh/LC_MESSAGES/django.mo | 4 ++-- apps/i18n/core/zh/LC_MESSAGES/django.po | 2 +- apps/i18n/lina/en.json | 9 ++++----- apps/i18n/lina/zh.json | 1 - apps/ops/models/adhoc.py | 2 +- apps/ops/serializers/job.py | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo index fe64a9fbf..208a9d2bc 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:970158849c0adeba85da98a2f1e45bd75f963764fb05f6ac1ccdcd19c68f2c6a -size 2025 +size 2025 \ No newline at end of file diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index bb78247f4..1c9015e26 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -926,7 +926,7 @@ msgstr "" #: tickets/models/ticket/general.py:297 users/models/user.py:836 #: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:110 msgid "Comment" -msgstr "Description" +msgstr "Comment" #: accounts/serializers/account/virtual.py:24 msgid "" @@ -4308,8 +4308,8 @@ msgid "Next execution time" msgstr "" #: ops/serializers/job.py:15 -msgid "Run after save" -msgstr "" +msgid "Execute after saving" +msgstr "Execute after saving" #: ops/serializers/job.py:52 msgid "Average time cost" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index 9d0077e5a..8750a637c 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:1b64a2cb215d6258ede3d9794241a80d7104690075054ad966e649834e49910f -size 170574 +oid sha256:11f0fb0b7cc4c3187c9e7913be7ca1d310a79a31fc10e950cdb1264b4725562f +size 170524 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index d056b5c41..75754a924 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-22 17:42+0800\n" +"POT-Creation-Date: 2024-02-23 17:11+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4434,7 +4434,9 @@ msgid "Next execution time" msgstr "最後の実行" #: ops/serializers/job.py:15 -msgid "Run after save" +#, fuzzy +#| msgid "Run after save" +msgid "Execute after saving" msgstr "保存後に実行" #: ops/serializers/job.py:52 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index 280765547..2ea403d17 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:048f6988bf37dd7b1c8d20d052009187fbb76548ea3608bb9704880f2dd28eef -size 140998 +oid sha256:03746a65d7eff0ef626fad8207b76f3c574b3c81dcac3f05d29b77ea694423e7 +size 141004 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 36877af6b..6aca450ee 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -4351,7 +4351,7 @@ msgid "Next execution time" msgstr "下次执行时间" #: ops/serializers/job.py:15 -msgid "Run after save" +msgid "Execute after saving" msgstr "保存后执行" #: ops/serializers/job.py:52 diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 654009caf..f3eec7103 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -115,12 +115,11 @@ "AssetAclList": "Asset Connect ACL", "AssetAclUpdate": "Update Asset Connect Rules", "AssetAddress": "Asset (IP/Hostname)", - "AssetAmount": "Assets", + "AssetAmount": "Asset amount", "AssetAndNode": "Assets/Nodes", "AssetBulkUpdateTips": "Network Devices, Cloud Services, Web, Batch Updating of Domains Not Supported", "AssetChangeSecretCreate": "Create Account Password Change", "AssetChangeSecretUpdate": "Update Account Password Change", - "AssetCount": "Asset Quantity", "AssetData": "Asset Data", "AssetDetail": "Asset Details", "AssetList": "Assets", @@ -213,7 +212,7 @@ "Chat": "Chat", "ChatAI": "Chat AI", "ChatHello": "Hello! How can I assist you?", - "ChdirHelpText": "By Default, the execution directory is the user's home directory", + "ChdirHelpText": "The default execution directory is the home directory of the executing user", "CheckAssetsAmount": "Check Asset Quantity", "CheckViewAcceptor": "Click to View the Acceptance Person", "CleanHelpText": "A scheduled cleanup task will be carried out every day at 2 a.m. The data cleaned up will not be recoverable", @@ -554,7 +553,7 @@ "IsSyncAccountHelpText": "Upon Collection Completion, the Collected Account Will Be Synced to Asset", "IsSyncAccountLabel": "Sync to Assets", "JDCloud": "Jingdong Cloud", - "Job": "Action", + "Job": "Job", "JobCenter": "Task Center", "JobCreate": "Create Job", "JobDetail": "Job Details", @@ -900,7 +899,7 @@ "RunTaskManually": "Manually Execute", "RunasHelpText": "Enter Username for Running Script", "RunasPolicy": "Account Policy", - "RunasPolicyHelpText": "When the current asset does not have this running user, what kind of account selection strategy should be adopted? Skip: do not perform. Preferring privileged account: If there is a privileged account, choose the privileged account first. If not, choose the regular account. Only privileged accounts: Choose only from privileged accounts. If not, do not execute", + "RunasPolicyHelpText": "When there are no users currently running on the asset, what account selection strategy should be adopted. Skip: Do not execute. Prioritize privileged accounts: If there are privileged accounts, select them first; if not, select regular accounts. Only privileged accounts: Select only from privileged accounts; if none exist, do not execute.", "RunningPath": "Running Path", "RunningPathHelpText": "Enter the run path of the script, this setting only applies to shell scripts", "RunningTimes": "Last 5 Run Times", diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index 3a4c18879..e82f3e4c7 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -118,7 +118,6 @@ "AssetBulkUpdateTips": "网络设备、云服务、web，不支持批量更新网域", "AssetChangeSecretCreate": "创建账号改密", "AssetChangeSecretUpdate": "更新账号改密", - "AssetCount": "资产数量", "AssetData": "资产数据", "AssetDetail": "资产详情", "AssetList": "资产列表", diff --git a/apps/ops/models/adhoc.py b/apps/ops/models/adhoc.py index f55b6f3d0..3ca2fa281 100644 --- a/apps/ops/models/adhoc.py +++ b/apps/ops/models/adhoc.py @@ -8,7 +8,7 @@ from common.utils import get_logger __all__ = ["AdHoc"] -from ops.const import AdHocModules +from ops.const import AdHocModules from orgs.mixins.models import JMSOrgBaseModel diff --git a/apps/ops/serializers/job.py b/apps/ops/serializers/job.py index ca0ff4d61..f3aff4ee6 100644 --- a/apps/ops/serializers/job.py +++ b/apps/ops/serializers/job.py @@ -12,7 +12,7 @@ from orgs.mixins.serializers import BulkOrgResourceModelSerializer class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin): creator = ReadableHiddenField(default=serializers.CurrentUserDefault()) - run_after_save = serializers.BooleanField(label=_("Run after save"), default=False, required=False) + run_after_save = serializers.BooleanField(label=_("Execute after saving"), default=False, required=False) nodes = serializers.ListField(required=False, child=serializers.CharField()) date_last_run = serializers.DateTimeField(label=_('Date last run'), read_only=True) name = serializers.CharField(label=_('Name'), max_length=128, allow_blank=True, required=False) From ad0f489834f64eedd6c65662f03416da2fb68883 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Fri, 23 Feb 2024 17:52:16 +0800 Subject: [PATCH 08/17] perf: translate (#12701) Co-authored-by: feng <1304903146@qq.com> --- apps/i18n/core/en/LC_MESSAGES/django.mo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo index 208a9d2bc..5e890a007 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:970158849c0adeba85da98a2f1e45bd75f963764fb05f6ac1ccdcd19c68f2c6a -size 2025 \ No newline at end of file +oid sha256:e5fd96f5c4a4a03bb017b500312085eea171ff4b009cfbc84b71f4480a6e97f0 +size 2081 From 0fd0d337049b6ef53abbbad34ad94958515b0ea4 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Fri, 23 Feb 2024 18:09:18 +0800 Subject: [PATCH 09/17] perf: i18n settings-notifications done. (#12702) Co-authored-by: Bai Co-authored-by: Bryan --- apps/i18n/core/en/LC_MESSAGES/django.mo | 4 +- apps/i18n/core/en/LC_MESSAGES/django.po | 72 +++++++++-------------- apps/i18n/core/ja/LC_MESSAGES/django.mo | 4 +- apps/i18n/core/ja/LC_MESSAGES/django.po | 77 +++++++++++-------------- apps/i18n/core/zh/LC_MESSAGES/django.mo | 4 +- apps/i18n/core/zh/LC_MESSAGES/django.po | 75 +++++++++++------------- apps/i18n/lina/en.json | 17 +++--- apps/ops/notifications.py | 4 +- apps/settings/serializers/auth/sms.py | 10 ++-- apps/settings/serializers/msg.py | 8 +-- apps/terminal/notifications.py | 8 +-- apps/terminal/serializers/command.py | 2 +- 12 files changed, 127 insertions(+), 158 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo index 5e890a007..96e577e58 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:e5fd96f5c4a4a03bb017b500312085eea171ff4b009cfbc84b71f4480a6e97f0 -size 2081 +oid sha256:e2f589794db086991c25ed95a157936d429747823eb873211ad5d04340d780fa +size 2186 diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 1c9015e26..9f497fce5 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-22 17:43+0800\n" +"POT-Creation-Date: 2024-02-23 17:56+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -298,6 +298,7 @@ msgstr "" #: ops/models/base.py:18 perms/models/asset_permission.py:75 #: perms/serializers/permission.py:45 settings/serializers/msg.py:33 #: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 +#: terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 #: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:89 @@ -1131,7 +1132,7 @@ msgstr "" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:182 settings/serializers/feature.py:19 -#: xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:78 xpack/plugins/license/models.py:30 msgid "Content" msgstr "" @@ -1426,7 +1427,7 @@ msgstr "" #: assets/const/category.py:16 common/sdk/sms/endpoint.py:20 msgid "Custom type" -msgstr "" +msgstr "Custom" #: assets/const/cloud.py:7 msgid "Public cloud" @@ -1791,7 +1792,7 @@ msgstr "" msgid "Ping asset" msgstr "" -#: assets/models/base.py:19 +#: assets/models/base.py:19 terminal/notifications.py:225 msgid "Connectivity" msgstr "" @@ -2981,8 +2982,9 @@ msgstr "" #: authentication/mfa/sms.py:12 authentication/serializers/password_mfa.py:16 #: authentication/serializers/password_mfa.py:24 -#: settings/serializers/auth/sms.py:32 users/forms/profile.py:104 -#: users/forms/profile.py:109 users/templates/users/forgot_password.html:155 +#: settings/serializers/auth/sms.py:17 settings/serializers/auth/sms.py:32 +#: users/forms/profile.py:104 users/forms/profile.py:109 +#: users/templates/users/forgot_password.html:155 #: users/views/profile/reset.py:100 msgid "SMS" msgstr "" @@ -3792,7 +3794,7 @@ msgstr "" #: common/sdk/sms/endpoint.py:21 msgid "Custom type (File)" -msgstr "" +msgstr "Custom (File)" #: common/sdk/sms/endpoint.py:32 msgid "SMS provider not support: {}" @@ -4243,7 +4245,7 @@ msgstr "" msgid "Runas policy" msgstr "" -#: ops/models/job.py:216 +#: ops/models/job.py:216 terminal/notifications.py:174 msgid "Job" msgstr "" @@ -4267,8 +4269,8 @@ msgstr "" msgid "VCS URL" msgstr "" -#: ops/notifications.py:17 rbac/tree.py:57 -msgid "App ops" +#: ops/notifications.py:17 +msgid "Components" msgstr "" #: ops/notifications.py:18 @@ -4784,6 +4786,10 @@ msgstr "" msgid "My assets" msgstr "" +#: rbac/tree.py:57 +msgid "App ops" +msgstr "" + #: rbac/tree.py:58 terminal/models/applet/applet.py:52 #: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:30 #: terminal/serializers/applet.py:15 @@ -5281,10 +5287,6 @@ msgstr "" msgid "Enable Slack Auth" msgstr "" -#: settings/serializers/auth/sms.py:17 -msgid "Enable SMS" -msgstr "" - #: settings/serializers/auth/sms.py:19 msgid "SMS provider / Protocol" msgstr "" @@ -5317,19 +5319,19 @@ msgid "Signature channel number" msgstr "" #: settings/serializers/auth/sms.py:73 -msgid "Enterprise code(SP id)" +msgid "Enterprise code" msgstr "" #: settings/serializers/auth/sms.py:74 -msgid "Shared secret(Shared secret)" +msgid "Shared secret" msgstr "" #: settings/serializers/auth/sms.py:75 -msgid "Original number(Src id)" +msgid "Original number" msgstr "" #: settings/serializers/auth/sms.py:76 -msgid "Business type(Service id)" +msgid "Business type" msgstr "" #: settings/serializers/auth/sms.py:80 @@ -5387,8 +5389,8 @@ msgid "" "External URL, email links or other system callbacks are used to access it, " "eg: http://dev.jumpserver.org:8080" msgstr "" -"Site URL are commonly used in emails sent or as callback addresses for external systems. " -"eg: http://dev.jumpserver.org:8080" +"Site URL are commonly used in emails sent or as callback addresses for " +"external systems. eg: http://dev.jumpserver.org:8080" #: settings/serializers/basic.py:18 msgid "User guide url" @@ -5468,7 +5470,7 @@ msgid "" "database, OSS will not be affected." msgstr "" -#: settings/serializers/feature.py:18 +#: settings/serializers/feature.py:18 settings/serializers/msg.py:68 msgid "Subject" msgstr "" @@ -5585,7 +5587,7 @@ msgid "Tips: Some provider use token except password" msgstr "" #: settings/serializers/msg.py:39 -msgid "Send user" +msgid "Sender" msgstr "" #: settings/serializers/msg.py:40 @@ -5625,10 +5627,6 @@ msgid "" "This is used by default if no email is returned during SSO authentication" msgstr "" -#: settings/serializers/msg.py:68 -msgid "Create user email subject" -msgstr "" - #: settings/serializers/msg.py:69 msgid "" "Tips: When creating a user, send the subject of the email (eg:Create account " @@ -5636,17 +5634,13 @@ msgid "" msgstr "" #: settings/serializers/msg.py:73 -msgid "Create user honorific" +msgid "Honorific" msgstr "" #: settings/serializers/msg.py:74 msgid "Tips: When creating a user, send the honorific of the email (eg:Hello)" msgstr "" -#: settings/serializers/msg.py:78 -msgid "Create user email content" -msgstr "" - #: settings/serializers/msg.py:80 #, python-brace-format msgid "" @@ -6798,7 +6792,7 @@ msgstr "" msgid "Command warning" msgstr "" -#: terminal/notifications.py:130 +#: terminal/notifications.py:130 terminal/notifications.py:175 msgid "Command reject" msgstr "" @@ -6806,17 +6800,9 @@ msgstr "" msgid "Level" msgstr "" -#: terminal/notifications.py:175 -msgid "Batch danger command alert" -msgstr "" - #: terminal/notifications.py:224 msgid "Command and replay storage" -msgstr "" - -#: terminal/notifications.py:225 -msgid "Connectivity alarm" -msgstr "" +msgstr "Storage" #: terminal/notifications.py:240 terminal/tasks.py:146 msgid "Test failure: Account invalid" @@ -6946,10 +6932,6 @@ msgstr "" msgid "Invalid session id" msgstr "" -#: terminal/serializers/command.py:72 -msgid "Account " -msgstr "" - #: terminal/serializers/command.py:74 msgid "Timestamp" msgstr "" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index 8750a637c..5c739fd85 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:11f0fb0b7cc4c3187c9e7913be7ca1d310a79a31fc10e950cdb1264b4725562f -size 170524 +oid sha256:25b15c04e4ee68befe30101c371b2b0b1c95e9371e6b85392a77255e91ab75dd +size 170094 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 75754a924..bddfa7fba 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-23 17:11+0800\n" +"POT-Creation-Date: 2024-02-23 17:56+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -298,6 +298,7 @@ msgstr "ソース ID" #: ops/models/base.py:18 perms/models/asset_permission.py:75 #: perms/serializers/permission.py:45 settings/serializers/msg.py:33 #: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 +#: terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 #: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:89 @@ -1150,7 +1151,7 @@ msgstr "正規情報" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:182 settings/serializers/feature.py:19 -#: xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:78 xpack/plugins/license/models.py:30 msgid "Content" msgstr "コンテンツ" @@ -1831,7 +1832,7 @@ msgstr "資産情報の収集" msgid "Ping asset" msgstr "テストアセット" -#: assets/models/base.py:19 +#: assets/models/base.py:19 terminal/notifications.py:225 msgid "Connectivity" msgstr "接続性" @@ -3052,8 +3053,9 @@ msgstr "メッセージ検証コードが無効" #: authentication/mfa/sms.py:12 authentication/serializers/password_mfa.py:16 #: authentication/serializers/password_mfa.py:24 -#: settings/serializers/auth/sms.py:32 users/forms/profile.py:104 -#: users/forms/profile.py:109 users/templates/users/forgot_password.html:155 +#: settings/serializers/auth/sms.py:17 settings/serializers/auth/sms.py:32 +#: users/forms/profile.py:104 users/forms/profile.py:109 +#: users/templates/users/forgot_password.html:155 #: users/views/profile/reset.py:100 msgid "SMS" msgstr "メッセージ" @@ -4365,7 +4367,7 @@ msgstr "ユーザーとして実行" msgid "Runas policy" msgstr "ユーザー ポリシー" -#: ops/models/job.py:216 +#: ops/models/job.py:216 terminal/notifications.py:174 msgid "Job" msgstr "ジョブ＃ジョブ＃" @@ -4389,9 +4391,11 @@ msgstr "创建方式" msgid "VCS URL" msgstr "VCS URL" -#: ops/notifications.py:17 rbac/tree.py:57 -msgid "App ops" -msgstr "アプリ操作" +#: ops/notifications.py:17 +#, fuzzy +#| msgid "Component" +msgid "Components" +msgstr "コンポーネント" #: ops/notifications.py:18 msgid "Server performance" @@ -4931,6 +4935,10 @@ msgstr "タスクセンター" msgid "My assets" msgstr "私の資産" +#: rbac/tree.py:57 +msgid "App ops" +msgstr "アプリ操作" + #: rbac/tree.py:58 terminal/models/applet/applet.py:52 #: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:30 #: terminal/serializers/applet.py:15 @@ -5443,10 +5451,6 @@ msgstr "SP 証明書" msgid "Enable Slack Auth" msgstr "Slack 認証の有効化" -#: settings/serializers/auth/sms.py:17 -msgid "Enable SMS" -msgstr "SMSの有効化" - #: settings/serializers/auth/sms.py:19 msgid "SMS provider / Protocol" msgstr "SMSプロバイダ / プロトコル" @@ -5479,19 +5483,19 @@ msgid "Signature channel number" msgstr "署名チャネル番号" #: settings/serializers/auth/sms.py:73 -msgid "Enterprise code(SP id)" +msgid "Enterprise code" msgstr "企業コード(SP id)" #: settings/serializers/auth/sms.py:74 -msgid "Shared secret(Shared secret)" +msgid "Shared secret" msgstr "パスワードを共有する(Shared secret)" #: settings/serializers/auth/sms.py:75 -msgid "Original number(Src id)" +msgid "Original number" msgstr "元の番号(Src id)" #: settings/serializers/auth/sms.py:76 -msgid "Business type(Service id)" +msgid "Business type" msgstr "ビジネス・タイプ(Service id)" #: settings/serializers/auth/sms.py:80 @@ -5636,7 +5640,7 @@ msgstr "" "この期間を超えるセッション、録音、およびコマンド レコードは削除されます (デー" "タベースのバックアップに影響し、OSS などには影響しません)" -#: settings/serializers/feature.py:18 +#: settings/serializers/feature.py:18 settings/serializers/msg.py:68 msgid "Subject" msgstr "件名" @@ -5758,7 +5762,7 @@ msgid "Tips: Some provider use token except password" msgstr "ヒント: 一部のプロバイダーはパスワード以外のトークンを使用します" #: settings/serializers/msg.py:39 -msgid "Send user" +msgid "Sender" msgstr "ユーザーを送信" #: settings/serializers/msg.py:40 @@ -5800,10 +5804,6 @@ msgid "" "This is used by default if no email is returned during SSO authentication" msgstr "これは、SSO認証中にメールが返されない場合にデフォルトで使用されます。" -#: settings/serializers/msg.py:68 -msgid "Create user email subject" -msgstr "ユーザーメール件名の作成" - #: settings/serializers/msg.py:69 msgid "" "Tips: When creating a user, send the subject of the email (eg:Create account " @@ -5813,7 +5813,7 @@ msgstr "" "正常に作成)" #: settings/serializers/msg.py:73 -msgid "Create user honorific" +msgid "Honorific" msgstr "ユーザー敬語の作成" #: settings/serializers/msg.py:74 @@ -5821,10 +5821,6 @@ msgid "Tips: When creating a user, send the honorific of the email (eg:Hello)" msgstr "" "ヒント: ユーザーを作成するときは、メールの敬語を送信します (例: こんにちは)" -#: settings/serializers/msg.py:78 -msgid "Create user email content" -msgstr "ユーザーのメールコンテンツを作成する" - #: settings/serializers/msg.py:80 #, python-brace-format msgid "" @@ -7042,7 +7038,7 @@ msgstr "セッション" msgid "Command warning" msgstr "コマンド警告" -#: terminal/notifications.py:130 +#: terminal/notifications.py:130 terminal/notifications.py:175 msgid "Command reject" msgstr "コマンド拒否" @@ -7050,18 +7046,10 @@ msgstr "コマンド拒否" msgid "Level" msgstr "レベル" -#: terminal/notifications.py:175 -msgid "Batch danger command alert" -msgstr "一括危険コマンド警告" - #: terminal/notifications.py:224 msgid "Command and replay storage" msgstr "コマンド及び録画記憶" -#: terminal/notifications.py:225 -msgid "Connectivity alarm" -msgstr "接続性アラーム" - #: terminal/notifications.py:240 terminal/tasks.py:146 msgid "Test failure: Account invalid" msgstr "テスト失敗: アカウントが無効" @@ -7207,10 +7195,6 @@ msgstr "無効なコマンドグループID" msgid "Invalid session id" msgstr "無効なセッションID" -#: terminal/serializers/command.py:72 -msgid "Account " -msgstr "アカウント" - #: terminal/serializers/command.py:74 msgid "Timestamp" msgstr "タイムスタンプ" @@ -8199,7 +8183,7 @@ msgstr "" #: users/serializers/user.py:169 #, fuzzy -#| msgid "Send user" +#| msgid "Sender" msgid "Superuser" msgstr "ユーザーを送信" @@ -9219,6 +9203,15 @@ msgstr "エンタープライズプロフェッショナル版" msgid "Ultimate edition" msgstr "エンタープライズ・フラッグシップ・エディション" +#~ msgid "Email Subject" +#~ msgstr "ユーザーメール件名の作成" + +#~ msgid "Command reject (Job)" +#~ msgstr "一括危険コマンド警告" + +#~ msgid "Account " +#~ msgstr "アカウント" + #~ msgid "Login time" #~ msgstr "ログイン時間" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index 2ea403d17..b5ccd2339 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:03746a65d7eff0ef626fad8207b76f3c574b3c81dcac3f05d29b77ea694423e7 -size 141004 +oid sha256:7b7274a5844ea33f2c6117210e0ba8baacbd450f15b1baef2af54dde1d588a55 +size 140636 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 6aca450ee..2574d856e 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/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: 2024-02-22 17:43+0800\n" +"POT-Creation-Date: 2024-02-23 17:56+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -297,6 +297,7 @@ msgstr "来源 ID" #: ops/models/base.py:18 perms/models/asset_permission.py:75 #: perms/serializers/permission.py:45 settings/serializers/msg.py:33 #: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 +#: terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 #: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:89 @@ -1142,7 +1143,7 @@ msgstr "正则表达式" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:182 settings/serializers/feature.py:19 -#: xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:78 xpack/plugins/license/models.py:30 msgid "Content" msgstr "内容" @@ -1815,7 +1816,7 @@ msgstr "收集资产信息" msgid "Ping asset" msgstr "测试资产" -#: assets/models/base.py:19 +#: assets/models/base.py:19 terminal/notifications.py:225 msgid "Connectivity" msgstr "连接性" @@ -3010,8 +3011,9 @@ msgstr "短信验证码校验失败" #: authentication/mfa/sms.py:12 authentication/serializers/password_mfa.py:16 #: authentication/serializers/password_mfa.py:24 -#: settings/serializers/auth/sms.py:32 users/forms/profile.py:104 -#: users/forms/profile.py:109 users/templates/users/forgot_password.html:155 +#: settings/serializers/auth/sms.py:17 settings/serializers/auth/sms.py:32 +#: users/forms/profile.py:104 users/forms/profile.py:109 +#: users/templates/users/forgot_password.html:155 #: users/views/profile/reset.py:100 msgid "SMS" msgstr "短信" @@ -4286,7 +4288,7 @@ msgstr "运行用户" msgid "Runas policy" msgstr "用户策略" -#: ops/models/job.py:216 +#: ops/models/job.py:216 terminal/notifications.py:174 msgid "Job" msgstr "作业" @@ -4310,9 +4312,11 @@ msgstr "创建方式" msgid "VCS URL" msgstr "VCS URL" -#: ops/notifications.py:17 rbac/tree.py:57 -msgid "App ops" -msgstr "作业中心" +#: ops/notifications.py:17 +#, fuzzy +#| msgid "Component" +msgid "Components" +msgstr "组件" #: ops/notifications.py:18 msgid "Server performance" @@ -4830,6 +4834,10 @@ msgstr "任务中心" msgid "My assets" msgstr "我的资产" +#: rbac/tree.py:57 +msgid "App ops" +msgstr "作业中心" + #: rbac/tree.py:58 terminal/models/applet/applet.py:52 #: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:30 #: terminal/serializers/applet.py:15 @@ -5333,10 +5341,6 @@ msgstr "SP 证书" msgid "Enable Slack Auth" msgstr "启用 Slack 认证" -#: settings/serializers/auth/sms.py:17 -msgid "Enable SMS" -msgstr "启用 SMS" - #: settings/serializers/auth/sms.py:19 msgid "SMS provider / Protocol" msgstr "短信服务商 / 协议" @@ -5369,19 +5373,19 @@ msgid "Signature channel number" msgstr "签名通道号" #: settings/serializers/auth/sms.py:73 -msgid "Enterprise code(SP id)" +msgid "Enterprise code" msgstr "企业代码(SP id)" #: settings/serializers/auth/sms.py:74 -msgid "Shared secret(Shared secret)" +msgid "Shared secret" msgstr "共享密码(Shared secret)" #: settings/serializers/auth/sms.py:75 -msgid "Original number(Src id)" +msgid "Original number" msgstr "原始号码(Src id)" #: settings/serializers/auth/sms.py:76 -msgid "Business type(Service id)" +msgid "Business type" msgstr "业务类型(Service id)" #: settings/serializers/auth/sms.py:80 @@ -5523,7 +5527,7 @@ msgid "" msgstr "" "会话、录像，命令记录超过该时长将会被清除 (影响数据库存储，OSS 等不受影响)" -#: settings/serializers/feature.py:18 +#: settings/serializers/feature.py:18 settings/serializers/msg.py:68 msgid "Subject" msgstr "主题" @@ -5642,7 +5646,7 @@ msgid "Tips: Some provider use token except password" msgstr "提示：一些邮件提供商需要输入的是授权码" #: settings/serializers/msg.py:39 -msgid "Send user" +msgid "Sender" msgstr "发件人" #: settings/serializers/msg.py:40 @@ -5682,10 +5686,6 @@ msgid "" "This is used by default if no email is returned during SSO authentication" msgstr "SSO认证时，如果没有返回邮件地址，将使用该后缀" -#: settings/serializers/msg.py:68 -msgid "Create user email subject" -msgstr "邮件主题" - #: settings/serializers/msg.py:69 msgid "" "Tips: When creating a user, send the subject of the email (eg:Create account " @@ -5693,17 +5693,13 @@ msgid "" msgstr "提示: 创建用户时，发送设置密码邮件的主题 (例如: 创建用户成功)" #: settings/serializers/msg.py:73 -msgid "Create user honorific" +msgid "Honorific" msgstr "邮件问候语" #: settings/serializers/msg.py:74 msgid "Tips: When creating a user, send the honorific of the email (eg:Hello)" msgstr "提示: 创建用户时，发送设置密码邮件的敬语 (例如: 你好)" -#: settings/serializers/msg.py:78 -msgid "Create user email content" -msgstr "邮件的内容" - #: settings/serializers/msg.py:80 #, python-brace-format msgid "" @@ -6890,7 +6886,7 @@ msgstr "会话" msgid "Command warning" msgstr "命令告警" -#: terminal/notifications.py:130 +#: terminal/notifications.py:130 terminal/notifications.py:175 msgid "Command reject" msgstr "命令拒绝" @@ -6898,18 +6894,10 @@ msgstr "命令拒绝" msgid "Level" msgstr "级别" -#: terminal/notifications.py:175 -msgid "Batch danger command alert" -msgstr "批量危险命令告警" - #: terminal/notifications.py:224 msgid "Command and replay storage" msgstr "命令及录像存储" -#: terminal/notifications.py:225 -msgid "Connectivity alarm" -msgstr "可连接性告警" - #: terminal/notifications.py:240 terminal/tasks.py:146 msgid "Test failure: Account invalid" msgstr "测试失败: 账号无效" @@ -7051,10 +7039,6 @@ msgstr "无效的 命令组 ID" msgid "Invalid session id" msgstr "无效的 Session ID" -#: terminal/serializers/command.py:72 -msgid "Account " -msgstr "账号" - #: terminal/serializers/command.py:74 msgid "Timestamp" msgstr "时间戳" @@ -9019,6 +9003,15 @@ msgstr "企业专业版" msgid "Ultimate edition" msgstr "企业旗舰版" +#~ msgid "Email Subject" +#~ msgstr "邮件主题" + +#~ msgid "Command reject (Job)" +#~ msgstr "批量危险命令告警" + +#~ msgid "Account " +#~ msgstr "账号" + #~ msgid "Wide logo on top" #~ msgstr "顶部宽 Logo" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index f3eec7103..1a4a5f0ca 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -78,7 +78,7 @@ "ApiKey": "API Key", "ApiKeyList": "Authenticate via Api key in the header of each request, which differs from one request to another, offering greater security than Token method. Please consult the documentation for usage.
To minimize the risk of leaks, the Secret can only be viewed upon creation, and each user can create up to 10", "ApiKeyWarning": "To reduce the risk of AccessKey leakage, the Secret is only provided at creation and cannot be queried later, please keep it safe.", - "AppEndpoint": "Application Access Address", + "AppEndpoint": "App Access Address", "AppOps": "Task Center", "AppProvider": "Application Providers", "AppProviderDetail": "Application Provider Details", @@ -206,7 +206,7 @@ "CertificateKey": "Client Key", "ChangeField": "Change Field", "ChangePassword": "Update Password", - "ChangeReceiver": "Modify Message Recipient", + "ChangeReceiver": "Edit Recipient", "ChangeSecretParams": "Change Password Parameters", "ChangeViewHelpText": "Click to Switch Different Views", "Chat": "Chat", @@ -297,7 +297,7 @@ "CreatePlaybook": "Create Playbook", "CreateReplayStorage": "Create Object Storage", "CreateSuccessMsg": "Import Successful, Total: {count}", - "CreateUserSetting": "Create User Content", + "CreateUserSetting": "User creation", "Created": "Created", "CreatedBy": "Creator", "CriticalLoad": "Serious", @@ -390,7 +390,7 @@ "Edit": "Edit", "Edition": "Version", "Email": "Email", - "EmailContent": "Custom Email Content", + "EmailContent": "Custom Content", "EmailTest": "Test Connection", "Empty": "Empty", "Enable": "Enable", @@ -621,7 +621,8 @@ "MFAOfUserFirstLoginPersonalInformationImprovementPage": "Enable multi-factor authentication to make your account more secure.
After enabling, you will enter the multi-factor authentication binding process the next time you log in; you can also directly bind in (Personal Information->Quick Modification->Change Multi-factor Settings)!", "MFAOfUserFirstLoginUserGuidePage": "In order to protect your and the company's security, please carefully safeguard important sensitive information such as your account, password, and key (for example, set a complex password, and enable multi-factor authentication)
Personal information such as email, mobile number, and WeChat are only used for user authentication and platform internal message notifications.", "MailRecipient": "Email Recipient", - "MailSend": "Email Sending", + "MailSend": "Sending", + "Server": "Server", "ManualAccount": "Manual Account", "ManualAccountTip": "Manual input of Username/Password upon Login", "ManualExecutePlan": "Manual Execute Plan", @@ -652,7 +653,7 @@ "More": "More", "MoreActions": "Actions", "MoveAssetToNode": "Move Assets to Nodes", - "MsgSubscribe": "Message Subscription", + "MsgSubscribe": "Subscription", "MyAssets": "My Assets", "MyTickets": "I Initiated", "Name": "Name", @@ -992,7 +993,7 @@ "ShowAssetAllChildrenNode": "Show All Sub-nodes Assets", "ShowAssetOnlyCurrentNode": "Only Show Current Node Assets", "ShowNodeInfo": "Show Node Details", - "SignChannelNum": "Channel Number Signature", + "SignChannelNum": "Channel Signature", "SiteMessage": "Site Message", "SiteMessageList": "Internal Mail", "Skip": "Ignore Current Asset", @@ -1189,7 +1190,7 @@ "VariableHelpText": "You Can Use {{ key }} to Read Built-in Variables in Commands", "VaultHelpText": "1. For security reasons, Vault storage must be enabled in the configuration file.
2. After enabled, fill in other configurations, and perform tests.
3. Carry out data synchronization, which is one-way, only syncing from the local database to the distant Vault, once synchronization is completed, the local database will no longer store passwords, please back up your data.
4. After modifying Vault configuration the second time, you need to restart the service.", "VerificationCodeSent": "Verification code has been sent", - "VerifySignTmpl": "Verification Code SMS Template", + "VerifySignTmpl": "SMS Template", "Version": "Version", "View": "View", "ViewBlockedIPSHelpText": "View List of Locked IPs", diff --git a/apps/ops/notifications.py b/apps/ops/notifications.py index b0c4906e4..c5950228a 100644 --- a/apps/ops/notifications.py +++ b/apps/ops/notifications.py @@ -13,8 +13,8 @@ __all__ = ('ServerPerformanceMessage', 'ServerPerformanceCheckUtil') class ServerPerformanceMessage(SystemMessage): - category = 'Operations' - category_label = _('App ops') + category = 'Components' + category_label = _('Components') message_type_label = _('Server performance') def __init__(self, terms_with_errors): diff --git a/apps/settings/serializers/auth/sms.py b/apps/settings/serializers/auth/sms.py index 1011c9aa6..5a2b8e319 100644 --- a/apps/settings/serializers/auth/sms.py +++ b/apps/settings/serializers/auth/sms.py @@ -14,7 +14,7 @@ __all__ = [ class SMSSettingSerializer(serializers.Serializer): - SMS_ENABLED = serializers.BooleanField(default=False, label=_('Enable SMS')) + SMS_ENABLED = serializers.BooleanField(default=False, label=_('SMS')) SMS_BACKEND = serializers.ChoiceField( choices=BACKENDS.choices, default=BACKENDS.ALIBABA, label=_('SMS provider / Protocol') ) @@ -70,10 +70,10 @@ class HuaweiSMSSettingSerializer(BaseSMSSettingSerializer): class CMPP2SMSSettingSerializer(BaseSMSSettingSerializer): CMPP2_HOST = serializers.CharField(max_length=256, required=True, label=_('Host')) CMPP2_PORT = serializers.IntegerField(default=7890, label=_('Port')) - CMPP2_SP_ID = serializers.CharField(max_length=128, required=True, label=_('Enterprise code(SP id)')) - CMPP2_SP_SECRET = EncryptedField(max_length=256, required=False, label=_('Shared secret(Shared secret)')) - CMPP2_SRC_ID = serializers.CharField(max_length=256, required=False, label=_('Original number(Src id)')) - CMPP2_SERVICE_ID = serializers.CharField(max_length=256, required=True, label=_('Business type(Service id)')) + CMPP2_SP_ID = serializers.CharField(max_length=128, required=True, label=_('Enterprise code')) + CMPP2_SP_SECRET = EncryptedField(max_length=256, required=False, label=_('Shared secret')) + CMPP2_SRC_ID = serializers.CharField(max_length=256, required=False, label=_('Original number')) + CMPP2_SERVICE_ID = serializers.CharField(max_length=256, required=True, label=_('Business type')) CMPP2_VERIFY_SIGN_NAME = serializers.CharField(max_length=256, required=True, label=_('Signature')) CMPP2_VERIFY_TEMPLATE_CODE = serializers.CharField( max_length=69, required=True, label=_('Template'), diff --git a/apps/settings/serializers/msg.py b/apps/settings/serializers/msg.py index ace4ab42c..0a2a222e5 100644 --- a/apps/settings/serializers/msg.py +++ b/apps/settings/serializers/msg.py @@ -36,7 +36,7 @@ class EmailSettingSerializer(serializers.Serializer): help_text=_("Tips: Some provider use token except password") ) EMAIL_FROM = serializers.CharField( - max_length=128, allow_blank=True, required=False, label=_('Send user'), + max_length=128, allow_blank=True, required=False, label=_('Sender'), help_text=_('Tips: Send mail account, default SMTP account as the send account') ) EMAIL_RECIPIENT = serializers.CharField( @@ -65,17 +65,17 @@ class EmailContentSettingSerializer(serializers.Serializer): EMAIL_CUSTOM_USER_CREATED_SUBJECT = serializers.CharField( max_length=1024, allow_blank=True, required=False, - label=_('Create user email subject'), + label=_('Subject'), help_text=_('Tips: When creating a user, send the subject of the email (eg:Create account successfully)') ) EMAIL_CUSTOM_USER_CREATED_HONORIFIC = serializers.CharField( max_length=1024, allow_blank=True, required=False, - label=_('Create user honorific'), + label=_('Honorific'), help_text=_('Tips: When creating a user, send the honorific of the email (eg:Hello)') ) EMAIL_CUSTOM_USER_CREATED_BODY = serializers.CharField( max_length=4096, allow_blank=True, required=False, - label=_('Create user email content'), + label=_('Content'), help_text=_( 'Tips: When creating a user, send the content of the email, support {username} {name} {email} label') ) diff --git a/apps/terminal/notifications.py b/apps/terminal/notifications.py index 0d2501450..ca49f23f2 100644 --- a/apps/terminal/notifications.py +++ b/apps/terminal/notifications.py @@ -170,9 +170,9 @@ class CommandAlertMessage(CommandAlertMixin, SystemMessage): class CommandExecutionAlert(CommandAlertMixin, SystemMessage): - category = CATEGORY - category_label = CATEGORY_LABEL - message_type_label = _('Batch danger command alert') + category = 'Workbench' + category_label = _('Job') + message_type_label = _('Command reject') def __init__(self, command): self.command = command @@ -222,7 +222,7 @@ class CommandExecutionAlert(CommandAlertMixin, SystemMessage): class StorageConnectivityMessage(SystemMessage): category = 'storage' category_label = _('Command and replay storage') - message_type_label = _('Connectivity alarm') + message_type_label = _('Connectivity') def __init__(self, errors): self.errors = errors diff --git a/apps/terminal/serializers/command.py b/apps/terminal/serializers/command.py index 11b16f5ad..907c1fe7c 100644 --- a/apps/terminal/serializers/command.py +++ b/apps/terminal/serializers/command.py @@ -69,7 +69,7 @@ class SessionCommandSerializerMixin(serializers.Serializer): """使用这个类作为基础Command Log Serializer类, 用来序列化""" id = serializers.UUIDField(read_only=True) # 限制 64 字符，不能直接迁移成 128 字符，命令表数据量会比较大 - account = serializers.CharField(label=_("Account ")) + account = serializers.CharField(label=_("Account")) output = serializers.CharField(max_length=2048, allow_blank=True, label=_("Output")) timestamp = serializers.IntegerField(label=_('Timestamp')) timestamp_display = serializers.DateTimeField(read_only=True, label=_('Datetime')) From 859bb91fc7a2c6aa8f65b24e65297fa2fe0c7083 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 26 Feb 2024 15:47:05 +0800 Subject: [PATCH 10/17] perf: i18n settings-Features done. --- apps/i18n/core/en/LC_MESSAGES/django.mo | 4 +-- apps/i18n/core/en/LC_MESSAGES/django.po | 45 +++++++------------------ apps/i18n/core/ja/LC_MESSAGES/django.mo | 4 +-- apps/i18n/core/ja/LC_MESSAGES/django.po | 43 +++++++---------------- apps/i18n/core/zh/LC_MESSAGES/django.mo | 4 +-- apps/i18n/core/zh/LC_MESSAGES/django.po | 43 +++++++---------------- apps/i18n/lina/en.json | 14 ++++---- apps/rbac/tree.py | 2 +- apps/settings/serializers/feature.py | 18 +++++----- 9 files changed, 61 insertions(+), 116 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo index 96e577e58..d003ce451 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:e2f589794db086991c25ed95a157936d429747823eb873211ad5d04340d780fa -size 2186 +oid sha256:9b625eab5cb43a5e6ffe64cc68887034be25fa4b2f9134cdfca12966930721fb +size 2301 diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 9f497fce5..804e654a3 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-23 17:56+0800\n" +"POT-Creation-Date: 2024-02-26 15:45+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4778,8 +4778,8 @@ msgstr "" msgid "Terminal setting" msgstr "" -#: rbac/tree.py:55 -msgid "Task Center" +#: rbac/tree.py:55 settings/serializers/feature.py:126 +msgid "Job center" msgstr "" #: rbac/tree.py:56 @@ -4805,7 +4805,7 @@ msgid "Ticket comment" msgstr "" #: rbac/tree.py:130 settings/serializers/feature.py:109 -#: tickets/models/ticket/general.py:307 +#: settings/serializers/feature.py:111 tickets/models/ticket/general.py:307 msgid "Ticket" msgstr "" @@ -5478,16 +5478,13 @@ msgstr "" msgid "More URL" msgstr "" -#: settings/serializers/feature.py:36 settings/serializers/feature.py:39 +#: settings/serializers/feature.py:36 settings/serializers/feature.py:38 +#: settings/serializers/feature.py:39 msgid "Announcement" msgstr "" -#: settings/serializers/feature.py:38 -msgid "Enable announcement" -msgstr "" - #: settings/serializers/feature.py:46 -msgid "Enable Vault" +msgid "Vault" msgstr "" #: settings/serializers/feature.py:55 @@ -5496,7 +5493,7 @@ msgstr "" #: settings/serializers/feature.py:60 msgid "Historical accounts retained count" -msgstr "" +msgstr "Retention" #: settings/serializers/feature.py:62 msgid "" @@ -5506,14 +5503,10 @@ msgid "" "account deletion will be performed." msgstr "" -#: settings/serializers/feature.py:71 +#: settings/serializers/feature.py:71 settings/serializers/feature.py:75 msgid "Chat AI" msgstr "" -#: settings/serializers/feature.py:75 -msgid "Enable Chat AI" -msgstr "" - #: settings/serializers/feature.py:78 msgid "Base URL" msgstr "" @@ -5526,12 +5519,8 @@ msgstr "" msgid "GPT Model" msgstr "" -#: settings/serializers/feature.py:111 -msgid "Enable tickets" -msgstr "" - #: settings/serializers/feature.py:114 -msgid "Ticket authorize default time" +msgid "Default period" msgstr "" #: settings/serializers/feature.py:117 @@ -5539,30 +5528,26 @@ msgid "hour" msgstr "" #: settings/serializers/feature.py:118 -msgid "Ticket authorize default time unit" +msgid "Default unit" msgstr "" #: settings/serializers/feature.py:123 msgid "Feature" msgstr "" -#: settings/serializers/feature.py:126 -msgid "Operation center" -msgstr "" - #: settings/serializers/feature.py:127 msgid "Allow user run batch command or not using ansible" msgstr "" #: settings/serializers/feature.py:131 -msgid "Operation center command blacklist" +msgid "Command blacklist" msgstr "" #: settings/serializers/feature.py:132 msgid "Commands that are not allowed execute." msgstr "" -#: settings/serializers/feature.py:137 +#: settings/serializers/feature.py:137 settings/serializers/feature.py:140 #: terminal/models/virtualapp/provider.py:17 #: terminal/models/virtualapp/virtualapp.py:36 #: terminal/models/virtualapp/virtualapp.py:97 @@ -5570,10 +5555,6 @@ msgstr "" msgid "Virtual app" msgstr "" -#: settings/serializers/feature.py:140 -msgid "Enable virtual app" -msgstr "" - #: settings/serializers/msg.py:25 msgid "SMTP" msgstr "" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index 5c739fd85..f644edce1 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:25b15c04e4ee68befe30101c371b2b0b1c95e9371e6b85392a77255e91ab75dd -size 170094 +oid sha256:e8b0f6631ac25f42278b8a3f287a35dbcd9bc771f9c2cf63d9338c6f7fa633bc +size 169665 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index bddfa7fba..f408f9718 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-23 17:56+0800\n" +"POT-Creation-Date: 2024-02-26 15:45+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4927,8 +4927,8 @@ msgstr "資産の改ざん" msgid "Terminal setting" msgstr "ターミナル設定" -#: rbac/tree.py:55 -msgid "Task Center" +#: rbac/tree.py:55 settings/serializers/feature.py:126 +msgid "Job center" msgstr "タスクセンター" #: rbac/tree.py:56 @@ -4954,7 +4954,7 @@ msgid "Ticket comment" msgstr "チケットコメント" #: rbac/tree.py:130 settings/serializers/feature.py:109 -#: tickets/models/ticket/general.py:307 +#: settings/serializers/feature.py:111 tickets/models/ticket/general.py:307 msgid "Ticket" msgstr "チケット" @@ -5648,16 +5648,13 @@ msgstr "件名" msgid "More URL" msgstr "もっとURL" -#: settings/serializers/feature.py:36 settings/serializers/feature.py:39 +#: settings/serializers/feature.py:36 settings/serializers/feature.py:38 +#: settings/serializers/feature.py:39 msgid "Announcement" msgstr "発表" -#: settings/serializers/feature.py:38 -msgid "Enable announcement" -msgstr "アナウンスの有効化" - #: settings/serializers/feature.py:46 -msgid "Enable Vault" +msgid "Vault" msgstr "有効化 Vault" #: settings/serializers/feature.py:55 @@ -5679,14 +5676,10 @@ msgstr "" "所定の数を超える履歴アカウントを確認して削除します。 値が 999 以上の場合、履" "歴アカウントの削除は実行されません。" -#: settings/serializers/feature.py:71 +#: settings/serializers/feature.py:71 settings/serializers/feature.py:75 msgid "Chat AI" msgstr "チャットAI" -#: settings/serializers/feature.py:75 -msgid "Enable Chat AI" -msgstr "チャットAIを起動する" - #: settings/serializers/feature.py:78 msgid "Base URL" msgstr "基本的なUrl" @@ -5699,12 +5692,8 @@ msgstr "API Key" msgid "GPT Model" msgstr "GPTモデル" -#: settings/serializers/feature.py:111 -msgid "Enable tickets" -msgstr "チケットを有効にする" - #: settings/serializers/feature.py:114 -msgid "Ticket authorize default time" +msgid "Default period" msgstr "デフォルト製造オーダ承認時間" #: settings/serializers/feature.py:117 @@ -5712,30 +5701,26 @@ msgid "hour" msgstr "時" #: settings/serializers/feature.py:118 -msgid "Ticket authorize default time unit" +msgid "Default unit" msgstr "デフォルト製造オーダ承認時間単位" #: settings/serializers/feature.py:123 msgid "Feature" msgstr "機能" -#: settings/serializers/feature.py:126 -msgid "Operation center" -msgstr "職業センター" - #: settings/serializers/feature.py:127 msgid "Allow user run batch command or not using ansible" msgstr "ユーザー実行バッチコマンドを許可するか、ansibleを使用しない" #: settings/serializers/feature.py:131 -msgid "Operation center command blacklist" +msgid "Command blacklist" msgstr "オペレーション センター コマンド ブラックリスト" #: settings/serializers/feature.py:132 msgid "Commands that are not allowed execute." msgstr "実行が許可されていないコマンド" -#: settings/serializers/feature.py:137 +#: settings/serializers/feature.py:137 settings/serializers/feature.py:140 #: terminal/models/virtualapp/provider.py:17 #: terminal/models/virtualapp/virtualapp.py:36 #: terminal/models/virtualapp/virtualapp.py:97 @@ -5743,10 +5728,6 @@ msgstr "実行が許可されていないコマンド" msgid "Virtual app" msgstr "仮想アプリケーション" -#: settings/serializers/feature.py:140 -msgid "Enable virtual app" -msgstr "仮想アプリケーションの有効化" - #: settings/serializers/msg.py:25 #, fuzzy #| msgid "SMTP host" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index b5ccd2339..433b274e7 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:7b7274a5844ea33f2c6117210e0ba8baacbd450f15b1baef2af54dde1d588a55 -size 140636 +oid sha256:d54631a07b63a1dfee00e6833df24fd7835cacd1bf938f94311f6fb6550ded5b +size 140300 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 2574d856e..3306221f9 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/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: 2024-02-23 17:56+0800\n" +"POT-Creation-Date: 2024-02-26 15:45+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -4826,8 +4826,8 @@ msgstr "资产改密" msgid "Terminal setting" msgstr "终端设置" -#: rbac/tree.py:55 -msgid "Task Center" +#: rbac/tree.py:55 settings/serializers/feature.py:126 +msgid "Job center" msgstr "任务中心" #: rbac/tree.py:56 @@ -4853,7 +4853,7 @@ msgid "Ticket comment" msgstr "工单评论" #: rbac/tree.py:130 settings/serializers/feature.py:109 -#: tickets/models/ticket/general.py:307 +#: settings/serializers/feature.py:111 tickets/models/ticket/general.py:307 msgid "Ticket" msgstr "工单" @@ -5535,16 +5535,13 @@ msgstr "主题" msgid "More URL" msgstr "更多信息 URL" -#: settings/serializers/feature.py:36 settings/serializers/feature.py:39 +#: settings/serializers/feature.py:36 settings/serializers/feature.py:38 +#: settings/serializers/feature.py:39 msgid "Announcement" msgstr "公告" -#: settings/serializers/feature.py:38 -msgid "Enable announcement" -msgstr "启用公告" - #: settings/serializers/feature.py:46 -msgid "Enable Vault" +msgid "Vault" msgstr "启用 Vault" #: settings/serializers/feature.py:55 @@ -5565,14 +5562,10 @@ msgstr "" "若特定数值小于999，系统将在每日晚间自动执行任务：检查并删除超出预定数量的历史" "账号。如果该数值达到或超过999，则不进行任何历史账号的删除操作。" -#: settings/serializers/feature.py:71 +#: settings/serializers/feature.py:71 settings/serializers/feature.py:75 msgid "Chat AI" msgstr "聊天 AI" -#: settings/serializers/feature.py:75 -msgid "Enable Chat AI" -msgstr "启动聊天 AI" - #: settings/serializers/feature.py:78 msgid "Base URL" msgstr "基本地址" @@ -5585,12 +5578,8 @@ msgstr "API Key" msgid "GPT Model" msgstr "GPT 模型" -#: settings/serializers/feature.py:111 -msgid "Enable tickets" -msgstr "启用工单" - #: settings/serializers/feature.py:114 -msgid "Ticket authorize default time" +msgid "Default period" msgstr "默认工单授权时间" #: settings/serializers/feature.py:117 @@ -5598,30 +5587,26 @@ msgid "hour" msgstr "时" #: settings/serializers/feature.py:118 -msgid "Ticket authorize default time unit" +msgid "Default unit" msgstr "默认工单授权时间单位" #: settings/serializers/feature.py:123 msgid "Feature" msgstr "功能" -#: settings/serializers/feature.py:126 -msgid "Operation center" -msgstr "作业中心" - #: settings/serializers/feature.py:127 msgid "Allow user run batch command or not using ansible" msgstr "是否允许用户使用 ansible 执行批量命令" #: settings/serializers/feature.py:131 -msgid "Operation center command blacklist" +msgid "Command blacklist" msgstr "作业中心命令黑名单" #: settings/serializers/feature.py:132 msgid "Commands that are not allowed execute." msgstr "不允许执行的命令" -#: settings/serializers/feature.py:137 +#: settings/serializers/feature.py:137 settings/serializers/feature.py:140 #: terminal/models/virtualapp/provider.py:17 #: terminal/models/virtualapp/virtualapp.py:36 #: terminal/models/virtualapp/virtualapp.py:97 @@ -5629,10 +5614,6 @@ msgstr "不允许执行的命令" msgid "Virtual app" msgstr "虚拟应用" -#: settings/serializers/feature.py:140 -msgid "Enable virtual app" -msgstr "启用虚拟应用" - #: settings/serializers/msg.py:25 msgid "SMTP" msgstr "SMTP" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 1a4a5f0ca..53c72a2d7 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -23,7 +23,8 @@ "AccountPushExecutionList": "Execute History", "AccountPushList": "Account Push", "AccountPushUpdate": "Update Account Push", - "AccountStorage": "Account Storage", + "AccountStorage": "Account", + "HistoryRecord": "History record", "AccountTemplate": "Template", "AccountTemplateList": "Templates", "AccountTemplateUpdateSecretHelpText": "The account list shows the accounts created through the template. When the secret is updated, the ciphertext of the accounts created through the template will be updated.", @@ -79,7 +80,7 @@ "ApiKeyList": "Authenticate via Api key in the header of each request, which differs from one request to another, offering greater security than Token method. Please consult the documentation for usage.
To minimize the risk of leaks, the Secret can only be viewed upon creation, and each user can create up to 10", "ApiKeyWarning": "To reduce the risk of AccessKey leakage, the Secret is only provided at creation and cannot be queried later, please keep it safe.", "AppEndpoint": "App Access Address", - "AppOps": "Task Center", + "AppOps": "Job center", "AppProvider": "Application Providers", "AppProviderDetail": "Application Provider Details", "AppletDetail": "Remote Apps", @@ -554,7 +555,7 @@ "IsSyncAccountLabel": "Sync to Assets", "JDCloud": "Jingdong Cloud", "Job": "Job", - "JobCenter": "Task Center", + "JobCenter": "Job center", "JobCreate": "Create Job", "JobDetail": "Job Details", "JobExecutionLog": "Job Logs", @@ -1016,6 +1017,7 @@ "StatusRed": "Last Task Execution Failed", "StatusYellow": "There have been recent failures", "Stop": "Stop", + "Storage": "Storage", "StorageSetting": "Storage", "Strategy": "Strategy", "StrategyCreate": "Create Policy", @@ -1090,7 +1092,7 @@ "TestPortErrorMsg": "Port Error, Please Re-enter", "TestSuccessMsg": "Test Succeeded", "Thursday": "Thursday", - "Ticket": "Work Orders", + "Ticket": "Ticket", "TicketDetail": "Work Order Details", "TicketFlow": "Work Order Flow", "TicketFlowCreate": "Create Approval Flow", @@ -1200,9 +1202,9 @@ "VirtualAccountDetail": "Details of virtual account", "VirtualAccountUpdate": "Virtual Account Update", "VirtualAccounts": "Virtual Accounts", - "VirtualApp": "Virtual Application", + "VirtualApp": "Virtual App", "VirtualAppDetail": "Virtual App Details", - "VirtualApps": "Virtual Application", + "VirtualApps": "Virtual App", "WeCom": "WeChat for Business", "WeComTest": "Test", "WebCreate": "Create Asset-Web", diff --git a/apps/rbac/tree.py b/apps/rbac/tree.py index 8e9a56831..9057f4908 100644 --- a/apps/rbac/tree.py +++ b/apps/rbac/tree.py @@ -52,7 +52,7 @@ extra_nodes_data = [ {"id": "push_account_node", "name": _("Push account"), "pId": "accounts"}, {"id": "asset_change_plan_node", "name": _("Asset change auth"), "pId": "accounts"}, {"id": "terminal_node", "name": _("Terminal setting"), "pId": "view_setting"}, - {'id': "task_center", "name": _("Task Center"), "pId": "view_console"}, + {'id': "task_center", "name": _("Job center"), "pId": "view_console"}, {'id': "my_assets", "name": _("My assets"), "pId": "view_workbench"}, {'id': "operation_center", "name": _('App ops'), "pId": "view_workbench"}, {'id': "remote_application", "name": _("Applet"), "pId": "view_setting"}, diff --git a/apps/settings/serializers/feature.py b/apps/settings/serializers/feature.py index 2fb163cae..79b8943a8 100644 --- a/apps/settings/serializers/feature.py +++ b/apps/settings/serializers/feature.py @@ -35,7 +35,7 @@ class AnnouncementSerializer(serializers.Serializer): class AnnouncementSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('Announcement') - ANNOUNCEMENT_ENABLED = serializers.BooleanField(label=_('Enable announcement'), default=True) + ANNOUNCEMENT_ENABLED = serializers.BooleanField(label=_('Announcement'), default=True) ANNOUNCEMENT = AnnouncementSerializer(label=_("Announcement")) @@ -43,7 +43,7 @@ class VaultSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('HCP Vault') VAULT_ENABLED = serializers.BooleanField( - required=False, label=_('Enable Vault'), read_only=True + required=False, label=_('Vault'), read_only=True ) VAULT_HCP_HOST = serializers.CharField( max_length=256, allow_blank=True, required=False, label=_('Host') @@ -72,7 +72,7 @@ class ChatAISettingSerializer(serializers.Serializer): GPT_MODEL_CHOICES = [] CHAT_AI_ENABLED = serializers.BooleanField( - required=False, label=_('Enable Chat AI') + required=False, label=_('Chat AI') ) GPT_BASE_URL = serializers.CharField( max_length=256, allow_blank=True, required=False, label=_('Base URL') @@ -108,14 +108,14 @@ class ChatAISettingSerializer(serializers.Serializer): class TicketSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('Ticket') - TICKETS_ENABLED = serializers.BooleanField(required=False, default=True, label=_("Enable tickets")) + TICKETS_ENABLED = serializers.BooleanField(required=False, default=True, label=_("Ticket")) TICKET_AUTHORIZE_DEFAULT_TIME = serializers.IntegerField( min_value=1, max_value=999999, required=False, - label=_("Ticket authorize default time") + label=_("Default period") ) TICKET_AUTHORIZE_DEFAULT_TIME_UNIT = serializers.ChoiceField( choices=[('day', _("day")), ('hour', _("hour"))], - label=_("Ticket authorize default time unit"), required=False, + label=_("Default unit"), required=False, ) @@ -123,12 +123,12 @@ class OpsSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('Feature') SECURITY_COMMAND_EXECUTION = serializers.BooleanField( - required=False, label=_('Operation center'), + required=False, label=_('Job center'), help_text=_('Allow user run batch command or not using ansible') ) SECURITY_COMMAND_BLACKLIST = serializers.ListField( child=serializers.CharField(max_length=1024, ), - label=_('Operation center command blacklist'), + label=_('Command blacklist'), help_text=_("Commands that are not allowed execute.") ) @@ -137,5 +137,5 @@ class VirtualAppSerializer(serializers.Serializer): PREFIX_TITLE = _('Virtual app') VIRTUAL_APP_ENABLED = serializers.BooleanField( - required=False, label=_('Enable virtual app'), + required=False, label=_('Virtual app'), ) From 10394dbb1c59ff5267fb6dca74c811cd5916e348 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 26 Feb 2024 16:53:40 +0800 Subject: [PATCH 11/17] perf: i18n settings-Auth done. --- apps/i18n/core/en/LC_MESSAGES/django.mo | 4 +- apps/i18n/core/en/LC_MESSAGES/django.po | 58 +++----------------- apps/i18n/core/ja/LC_MESSAGES/django.mo | 4 +- apps/i18n/core/ja/LC_MESSAGES/django.po | 59 +++------------------ apps/i18n/core/zh/LC_MESSAGES/django.mo | 4 +- apps/i18n/core/zh/LC_MESSAGES/django.po | 61 +++------------------- apps/i18n/lina/en.json | 4 +- apps/settings/serializers/auth/base.py | 2 +- apps/settings/serializers/auth/cas.py | 13 +++-- apps/settings/serializers/auth/dingtalk.py | 8 +-- apps/settings/serializers/auth/feishu.py | 2 +- apps/settings/serializers/auth/ldap.py | 6 +-- apps/settings/serializers/auth/oauth2.py | 4 +- apps/settings/serializers/auth/oidc.py | 6 +-- apps/settings/serializers/auth/passkey.py | 2 +- apps/settings/serializers/auth/radius.py | 2 +- apps/settings/serializers/auth/saml2.py | 4 +- apps/settings/serializers/auth/slack.py | 2 +- apps/settings/serializers/auth/wecom.py | 2 +- 19 files changed, 58 insertions(+), 189 deletions(-) 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')) From c8b274031fdc19ddcb674e0701238daa608641ff Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 27 Feb 2024 11:25:42 +0800 Subject: [PATCH 12/17] perf: i18n settings-Auth done. --- apps/authentication/backends/saml2/views.py | 4 +-- apps/i18n/core/en/LC_MESSAGES/django.po | 28 +++++++-------- apps/i18n/core/ja/LC_MESSAGES/django.mo | 4 +-- apps/i18n/core/ja/LC_MESSAGES/django.po | 38 +++++++++------------ apps/i18n/core/zh/LC_MESSAGES/django.mo | 4 +-- apps/i18n/core/zh/LC_MESSAGES/django.po | 36 +++++++++---------- apps/i18n/lina/en.json | 2 +- apps/i18n/lina/zh.json | 2 +- apps/settings/serializers/auth/oauth2.py | 10 +++--- apps/settings/serializers/auth/oidc.py | 22 ++++++------ apps/settings/serializers/auth/passkey.py | 4 +-- apps/settings/serializers/auth/saml2.py | 4 +-- apps/settings/serializers/auth/wecom.py | 6 ++-- 13 files changed, 76 insertions(+), 88 deletions(-) diff --git a/apps/authentication/backends/saml2/views.py b/apps/authentication/backends/saml2/views.py index 235dd2c38..aa676bef4 100644 --- a/apps/authentication/backends/saml2/views.py +++ b/apps/authentication/backends/saml2/views.py @@ -50,7 +50,7 @@ class PrepareRequestMixin: if idp_metadata_xml.strip(): xml_idp_settings = IdPMetadataParse.parse(idp_metadata_xml) except Exception as err: - logger.warning('Failed to get IDP metadata XML settings, error: %s', str(err)) + logger.warning('Failed to get IDP Metadata XML settings, error: %s', str(err)) url_idp_settings = None try: @@ -59,7 +59,7 @@ class PrepareRequestMixin: idp_metadata_url, timeout=20 ) except Exception as err: - logger.warning('Failed to get IDP metadata URL settings, error: %s', str(err)) + logger.warning('Failed to get IDP Metadata URL settings, error: %s', str(err)) idp_settings = url_idp_settings or xml_idp_settings diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 9575cc669..1df7ab6a7 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -5099,11 +5099,11 @@ msgid "Client Secret" msgstr "" #: settings/serializers/auth/oauth2.py:39 settings/serializers/auth/oidc.py:68 -msgid "Provider auth endpoint" +msgid "Authorization endpoint" msgstr "" #: settings/serializers/auth/oauth2.py:42 settings/serializers/auth/oidc.py:71 -msgid "Provider token endpoint" +msgid "Token endpoint" msgstr "" #: settings/serializers/auth/oauth2.py:45 settings/serializers/auth/oidc.py:30 @@ -5111,11 +5111,11 @@ msgid "Client authentication method" msgstr "" #: settings/serializers/auth/oauth2.py:49 settings/serializers/auth/oidc.py:77 -msgid "Provider userinfo endpoint" +msgid "Userinfo endpoint" msgstr "" #: settings/serializers/auth/oauth2.py:52 settings/serializers/auth/oidc.py:80 -msgid "Provider end session endpoint" +msgid "End session endpoint" msgstr "" #: settings/serializers/auth/oauth2.py:59 settings/serializers/auth/oidc.py:98 @@ -5136,7 +5136,7 @@ msgid "Share session" msgstr "" #: settings/serializers/auth/oidc.py:34 -msgid "Ignore ssl verification" +msgid "Ignore SSL verification" msgstr "" #: settings/serializers/auth/oidc.py:38 @@ -5166,15 +5166,15 @@ msgid "Provider endpoint" msgstr "" #: settings/serializers/auth/oidc.py:74 -msgid "Provider jwks endpoint" +msgid "JWKS endpoint" msgstr "" #: settings/serializers/auth/oidc.py:83 -msgid "Provider sign alg" +msgid "Signature algorithm" msgstr "" #: settings/serializers/auth/oidc.py:86 -msgid "Provider sign key" +msgid "Signing key" msgstr "" #: settings/serializers/auth/oidc.py:88 @@ -5182,11 +5182,11 @@ msgid "Scopes" msgstr "" #: settings/serializers/auth/oidc.py:90 -msgid "Id token max age (s)" +msgid "ID Token max age (s)" msgstr "" #: settings/serializers/auth/oidc.py:93 -msgid "Id token include claims" +msgid "ID Token include claims" msgstr "" #: settings/serializers/auth/oidc.py:95 @@ -5228,11 +5228,11 @@ msgid "SAML2" msgstr "" #: settings/serializers/auth/saml2.py:16 -msgid "IDP metadata URL" +msgid "IDP Metadata URL" msgstr "" #: settings/serializers/auth/saml2.py:19 -msgid "IDP metadata XML" +msgid "IDP Metadata XML" msgstr "" #: settings/serializers/auth/saml2.py:22 @@ -5315,10 +5315,6 @@ msgstr "" msgid "URL" msgstr "" -#: settings/serializers/auth/sms.py:106 -msgid "Request method" -msgstr "" - #: settings/serializers/auth/sso.py:16 msgid "Enable SSO auth" msgstr "" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index ac3cefa5b..2f6208cfd 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:6da7aefc64a80f4087d6067571d10f37da3b328abf175feb380a717931313257 -size 168890 +oid sha256:6386a18d95935085c5b31597f5de7f93887f01d7e41a896e28931b6c6b6365b6 +size 168785 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 3d1d90989..d6a30f2f8 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -5257,23 +5257,23 @@ msgid "Client Secret" msgstr "クライアント秘密" #: settings/serializers/auth/oauth2.py:39 settings/serializers/auth/oidc.py:68 -msgid "Provider auth endpoint" +msgid "Authorization endpoint" msgstr "認証エンドポイントアドレス" #: settings/serializers/auth/oauth2.py:42 settings/serializers/auth/oidc.py:71 -msgid "Provider token endpoint" +msgid "Token endpoint" msgstr "プロバイダートークンエンドポイント" #: settings/serializers/auth/oauth2.py:45 settings/serializers/auth/oidc.py:30 -msgid "Client authentication method" +msgid "Request method" msgstr "クライアント認証方式" #: settings/serializers/auth/oauth2.py:49 settings/serializers/auth/oidc.py:77 -msgid "Provider userinfo endpoint" +msgid "Userinfo endpoint" msgstr "プロバイダーuserinfoエンドポイント" #: settings/serializers/auth/oauth2.py:52 settings/serializers/auth/oidc.py:80 -msgid "Provider end session endpoint" +msgid "End session endpoint" msgstr "プロバイダーのセッション終了エンドポイント" #: settings/serializers/auth/oauth2.py:59 settings/serializers/auth/oidc.py:98 @@ -5294,7 +5294,7 @@ msgid "Share session" msgstr "セッションの共有" #: settings/serializers/auth/oidc.py:34 -msgid "Ignore ssl verification" +msgid "Ignore SSL verification" msgstr "Ssl検証を無視する" #: settings/serializers/auth/oidc.py:38 @@ -5326,15 +5326,15 @@ msgid "Provider endpoint" msgstr "プロバイダーエンドポイント" #: settings/serializers/auth/oidc.py:74 -msgid "Provider jwks endpoint" +msgid "JWKS endpoint" msgstr "プロバイダーjwksエンドポイント" #: settings/serializers/auth/oidc.py:83 -msgid "Provider sign alg" +msgid "Signature algorithm" msgstr "プロビダーサインalg" #: settings/serializers/auth/oidc.py:86 -msgid "Provider sign key" +msgid "Signing key" msgstr "プロバイダ署名キー" #: settings/serializers/auth/oidc.py:88 @@ -5342,11 +5342,11 @@ msgid "Scopes" msgstr "スコープ" #: settings/serializers/auth/oidc.py:90 -msgid "Id token max age (s)" +msgid "ID Token max age (s)" msgstr "IDトークンの最大年齢 (秒)" #: settings/serializers/auth/oidc.py:93 -msgid "Id token include claims" +msgid "ID Token include claims" msgstr "IDトークンにはクレームが含まれます" #: settings/serializers/auth/oidc.py:95 @@ -5362,7 +5362,7 @@ msgid "Only SSL domain can use passkey auth" msgstr "SSLドメインのみがパスキー認証を使用できます" #: settings/serializers/auth/passkey.py:15 -msgid "FIDO server ID" +msgid "FIDO Server ID" msgstr "FIDOサーバーID" #: settings/serializers/auth/passkey.py:17 @@ -5375,7 +5375,7 @@ msgstr "" "ます" #: settings/serializers/auth/passkey.py:22 -msgid "FIDO server name" +msgid "FIDO Server name" msgstr "FIDOサーバー名" #: settings/serializers/auth/radius.py:13 @@ -5391,12 +5391,12 @@ msgid "SAML2" msgstr "SAML2" #: settings/serializers/auth/saml2.py:16 -msgid "IDP metadata URL" -msgstr "IDP metadata アドレス" +msgid "IDP Metadata URL" +msgstr "IDP Metadataアドレス" #: settings/serializers/auth/saml2.py:19 -msgid "IDP metadata XML" -msgstr "IDP metadata XML" +msgid "IDP Metadata XML" +msgstr "IDP Metadata XML" #: settings/serializers/auth/saml2.py:22 msgid "SP advanced settings" @@ -5481,10 +5481,6 @@ msgstr "署名+テンプレートの長さは65文字以内" msgid "URL" msgstr "URL" -#: settings/serializers/auth/sms.py:106 -msgid "Request method" -msgstr "請求方法です" - #: settings/serializers/auth/sso.py:16 msgid "Enable SSO auth" msgstr "SSO Token認証の有効化" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index 0e20cf1a9..ee6813865 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:bb1dbb645c2345048bdbeb9b842a695a222533c0362b8101db18b87bfeaaf326 -size 139633 +oid sha256:07fc143922960ec9d8f76f3353c8fc8c74cd8a68f0c52cd27686cdf05fca925d +size 139535 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 9f21daf59..a8cb08d25 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -5148,23 +5148,23 @@ msgid "Client Secret" msgstr "客户端密钥" #: settings/serializers/auth/oauth2.py:39 settings/serializers/auth/oidc.py:68 -msgid "Provider auth endpoint" +msgid "Authorization endpoint" msgstr "授权端点地址" #: settings/serializers/auth/oauth2.py:42 settings/serializers/auth/oidc.py:71 -msgid "Provider token endpoint" +msgid "Token endpoint" msgstr "token 端点地址" #: settings/serializers/auth/oauth2.py:45 settings/serializers/auth/oidc.py:30 -msgid "Client authentication method" +msgid "Request method" msgstr "客户端认证方式" #: settings/serializers/auth/oauth2.py:49 settings/serializers/auth/oidc.py:77 -msgid "Provider userinfo endpoint" +msgid "Userinfo endpoint" msgstr "用户信息端点地址" #: settings/serializers/auth/oauth2.py:52 settings/serializers/auth/oidc.py:80 -msgid "Provider end session endpoint" +msgid "End session endpoint" msgstr "注销会话端点地址" #: settings/serializers/auth/oauth2.py:59 settings/serializers/auth/oidc.py:98 @@ -5181,7 +5181,7 @@ msgid "Share session" msgstr "共享会话" #: settings/serializers/auth/oidc.py:34 -msgid "Ignore ssl verification" +msgid "Ignore SSL verification" msgstr "忽略 SSL 证书验证" #: settings/serializers/auth/oidc.py:38 @@ -5217,15 +5217,15 @@ msgid "Provider endpoint" msgstr "端点地址" #: settings/serializers/auth/oidc.py:74 -msgid "Provider jwks endpoint" +msgid "JWKS endpoint" msgstr "jwks 端点地址" #: settings/serializers/auth/oidc.py:83 -msgid "Provider sign alg" +msgid "Signature algorithm" msgstr "签名算法" #: settings/serializers/auth/oidc.py:86 -msgid "Provider sign key" +msgid "Signing key" msgstr "签名 Key" #: settings/serializers/auth/oidc.py:88 @@ -5233,11 +5233,11 @@ msgid "Scopes" msgstr "连接范围" #: settings/serializers/auth/oidc.py:90 -msgid "Id token max age (s)" +msgid "ID Token max age (s)" msgstr "令牌有效时间 (秒)" #: settings/serializers/auth/oidc.py:93 -msgid "Id token include claims" +msgid "ID Token include claims" msgstr "声明" #: settings/serializers/auth/oidc.py:95 @@ -5253,7 +5253,7 @@ msgid "Only SSL domain can use passkey auth" msgstr "只有 SSL 域名可以使用 Passkey(通行密钥)认证" #: settings/serializers/auth/passkey.py:15 -msgid "FIDO server ID" +msgid "FIDO Server ID" msgstr "Passkey 服务域名" #: settings/serializers/auth/passkey.py:17 @@ -5265,7 +5265,7 @@ msgstr "" "DOMAINS中), 如果有多个域名，使用逗号分隔, 不需要端口号" #: settings/serializers/auth/passkey.py:22 -msgid "FIDO server name" +msgid "FIDO Server name" msgstr "Passkey 服务名称" #: settings/serializers/auth/radius.py:13 @@ -5281,12 +5281,12 @@ msgid "SAML2" msgstr "SAML2" #: settings/serializers/auth/saml2.py:16 -msgid "IDP metadata URL" -msgstr "IDP metadata 地址" +msgid "IDP Metadata URL" +msgstr "IDP Metadata 地址" #: settings/serializers/auth/saml2.py:19 msgid "IDP metadata XML" -msgstr "IDP metadata XML" +msgstr "IDP Metadata XML" #: settings/serializers/auth/saml2.py:22 msgid "SP advanced settings" @@ -5370,10 +5370,6 @@ msgstr "模板+签名不能超过65个字" msgid "URL" msgstr "URL" -#: settings/serializers/auth/sms.py:106 -msgid "Request method" -msgstr "请求方式" - #: settings/serializers/auth/sso.py:16 msgid "Enable SSO auth" msgstr "启用 SSO 令牌认证" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index e7e7ef642..efe5992d9 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -507,7 +507,7 @@ "Id": "ID", "IdeaContent": "I want you to act as a Linux terminal. I will input the commands, you will respond with what the terminal should display. I hope you to reply only in a unique code block, not others. No interpretations. When I need to tell you something, I'm gonna put the words in braces {note text}", "IdeaTitle": "🌱 Linux Terminal", - "IdpMetadataHelpText": "Either IDP metadata URL or IDP metadata XML is acceptable, with IDP metadata URL having higher priority", + "IdpMetadataHelpText": "Either IDP Metadata URL or IDP Metadata XML is acceptable, with IDP Metadata URL having higher priority", "IdpMetadataUrlHelpText": "Load IDP Metadata from Remote Address", "ImageName": "Image Name", "Images": "Image", diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index e82f3e4c7..f75b62f37 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -501,7 +501,7 @@ "Id": "ID", "IdeaContent": "我想让你充当一个 Linux 终端。我将输入命令，你将回答终端应该显示的内容。我希望你只在一个独特的代码块内回复终端输出，而不是其他。不要写解释。当我需要告诉你一些事情时，我会把文字放在大括号里{备注文本}。", "IdeaTitle": "🌱 Linux 终端", - "IdpMetadataHelpText": "IDP metadata URL 和 IDP metadata XML参数二选一即可，IDP metadata URL的优先级高", + "IdpMetadataHelpText": "IDP Metadata URL 和 IDP MetadataXML参数二选一即可，IDP MetadataURL的优先级高", "IdpMetadataUrlHelpText": "从远端地址中加载 IDP Metadata", "ImageName": "镜像名", "Images": "图片", diff --git a/apps/settings/serializers/auth/oauth2.py b/apps/settings/serializers/auth/oauth2.py index 346f66092..d554c03ad 100644 --- a/apps/settings/serializers/auth/oauth2.py +++ b/apps/settings/serializers/auth/oauth2.py @@ -36,20 +36,20 @@ class OAuth2SettingSerializer(serializers.Serializer): required=True, max_length=1024, label=_('Scope'), allow_blank=True ) AUTH_OAUTH2_PROVIDER_AUTHORIZATION_ENDPOINT = serializers.CharField( - required=True, max_length=1024, label=_('Provider auth endpoint') + required=True, max_length=1024, label=_('Authorization endpoint') ) AUTH_OAUTH2_ACCESS_TOKEN_ENDPOINT = serializers.CharField( - required=True, max_length=1024, label=_('Provider token endpoint') + required=True, max_length=1024, label=_('Token endpoint') ) AUTH_OAUTH2_ACCESS_TOKEN_METHOD = serializers.ChoiceField( - default='GET', label=_('Client authentication method'), + default='GET', label=_('Request method'), choices=(('GET', 'GET'), ('POST', 'POST-DATA'), ('POST_JSON', 'POST-JSON')) ) AUTH_OAUTH2_PROVIDER_USERINFO_ENDPOINT = serializers.CharField( - required=True, max_length=1024, label=_('Provider userinfo endpoint') + required=True, max_length=1024, label=_('Userinfo endpoint') ) AUTH_OAUTH2_PROVIDER_END_SESSION_ENDPOINT = serializers.CharField( - required=False, allow_blank=True, max_length=1024, label=_('Provider end session endpoint') + required=False, allow_blank=True, max_length=1024, label=_('End session endpoint') ) AUTH_OAUTH2_LOGOUT_COMPLETELY = serializers.BooleanField(required=False, label=_('Logout completely')) AUTH_OAUTH2_USER_ATTR_MAP = serializers.JSONField( diff --git a/apps/settings/serializers/auth/oidc.py b/apps/settings/serializers/auth/oidc.py index 3e594c3c1..44cecfbd5 100644 --- a/apps/settings/serializers/auth/oidc.py +++ b/apps/settings/serializers/auth/oidc.py @@ -27,11 +27,11 @@ class CommonSettingSerializer(serializers.Serializer): ('client_secret_basic', 'Client Secret Basic'), ('client_secret_post', 'Client Secret Post') ), - label=_('Client authentication method') + label=_('Request method') ) AUTH_OPENID_SHARE_SESSION = serializers.BooleanField(required=False, label=_('Share session')) AUTH_OPENID_IGNORE_SSL_VERIFICATION = serializers.BooleanField( - required=False, label=_('Ignore ssl verification') + required=False, label=_('Ignore SSL verification') ) AUTH_OPENID_USER_ATTR_MAP = serializers.JSONField( required=True, label=_('User attribute'), @@ -65,32 +65,32 @@ class OIDCSettingSerializer(KeycloakSettingSerializer): required=False, max_length=1024, label=_('Provider endpoint') ) AUTH_OPENID_PROVIDER_AUTHORIZATION_ENDPOINT = serializers.CharField( - required=False, max_length=1024, label=_('Provider auth endpoint') + required=False, max_length=1024, label=_('Authorization endpoint') ) AUTH_OPENID_PROVIDER_TOKEN_ENDPOINT = serializers.CharField( - required=False, max_length=1024, label=_('Provider token endpoint') + required=False, max_length=1024, label=_('Token endpoint') ) AUTH_OPENID_PROVIDER_JWKS_ENDPOINT = serializers.CharField( - required=False, max_length=1024, label=_('Provider jwks endpoint') + required=False, max_length=1024, label=_('JWKS endpoint') ) AUTH_OPENID_PROVIDER_USERINFO_ENDPOINT = serializers.CharField( - required=False, max_length=1024, label=_('Provider userinfo endpoint') + required=False, max_length=1024, label=_('Userinfo endpoint') ) AUTH_OPENID_PROVIDER_END_SESSION_ENDPOINT = serializers.CharField( - required=False, max_length=1024, label=_('Provider end session endpoint') + required=False, max_length=1024, label=_('End session endpoint') ) AUTH_OPENID_PROVIDER_SIGNATURE_ALG = serializers.CharField( - required=False, max_length=1024, label=_('Provider sign alg') + required=False, max_length=1024, label=_('Signature algorithm') ) AUTH_OPENID_PROVIDER_SIGNATURE_KEY = serializers.CharField( - required=False, max_length=1024, allow_null=True, label=_('Provider sign key') + required=False, max_length=1024, allow_null=True, label=_('Signing key') ) AUTH_OPENID_SCOPES = serializers.CharField(required=False, max_length=1024, label=_('Scopes')) AUTH_OPENID_ID_TOKEN_MAX_AGE = serializers.IntegerField( - required=False, label=_('Id token max age (s)') + required=False, label=_('ID Token max age (s)') ) AUTH_OPENID_ID_TOKEN_INCLUDE_CLAIMS = serializers.BooleanField( - required=False, label=_('Id token include claims') + required=False, label=_('ID Token include claims') ) AUTH_OPENID_USE_STATE = serializers.BooleanField(required=False, label=_('Use state')) AUTH_OPENID_USE_NONCE = serializers.BooleanField(required=False, label=_('Use nonce')) diff --git a/apps/settings/serializers/auth/passkey.py b/apps/settings/serializers/auth/passkey.py index fc86b1447..fd2155e4c 100644 --- a/apps/settings/serializers/auth/passkey.py +++ b/apps/settings/serializers/auth/passkey.py @@ -12,11 +12,11 @@ class PasskeySettingSerializer(serializers.Serializer): help_text=_('Only SSL domain can use passkey auth') ) FIDO_SERVER_ID = serializers.CharField( - max_length=255, label=_('FIDO server ID'), required=False, allow_blank=True, + max_length=255, label=_('FIDO Server ID'), required=False, allow_blank=True, help_text=_( 'The hostname can using passkey auth, If not set, ' 'will use request host and the request host in DOMAINS, ' 'If multiple domains, use comma to separate' ) ) - FIDO_SERVER_NAME = serializers.CharField(max_length=255, label=_('FIDO server name')) + FIDO_SERVER_NAME = serializers.CharField(max_length=255, label=_('FIDO Server name')) diff --git a/apps/settings/serializers/auth/saml2.py b/apps/settings/serializers/auth/saml2.py index 691d40afc..7e49a3895 100644 --- a/apps/settings/serializers/auth/saml2.py +++ b/apps/settings/serializers/auth/saml2.py @@ -13,10 +13,10 @@ class SAML2SettingSerializer(serializers.Serializer): default=False, required=False, label=_('SAML2') ) SAML2_IDP_METADATA_URL = serializers.URLField( - allow_blank=True, required=False, label=_('IDP metadata URL') + allow_blank=True, required=False, label=_('IDP Metadata URL') ) SAML2_IDP_METADATA_XML = serializers.CharField( - allow_blank=True, required=False, label=_('IDP metadata XML') + allow_blank=True, required=False, label=_('IDP Metadata XML') ) SAML2_SP_ADVANCED_SETTINGS = serializers.JSONField( required=False, label=_('SP advanced settings') diff --git a/apps/settings/serializers/auth/wecom.py b/apps/settings/serializers/auth/wecom.py index 74ef3402f..72c315c24 100644 --- a/apps/settings/serializers/auth/wecom.py +++ b/apps/settings/serializers/auth/wecom.py @@ -9,7 +9,7 @@ __all__ = ['WeComSettingSerializer'] class WeComSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('WeCom') - 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') + WECOM_CORPID = serializers.CharField(max_length=256, required=True, label='Corporation ID') + WECOM_AGENTID = serializers.CharField(max_length=256, required=True, label='App Agent ID') + WECOM_SECRET = EncryptedField(max_length=256, required=False, label='App Secret') AUTH_WECOM = serializers.BooleanField(default=False, label=_('WeCom')) From 7268f6034381b2b1c1273ed0a09b1a1dc8b8f73b Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 27 Feb 2024 14:59:22 +0800 Subject: [PATCH 13/17] perf: i18n settings-Storage done. --- apps/i18n/core/en/LC_MESSAGES/django.po | 2 +- apps/i18n/core/ja/LC_MESSAGES/django.mo | 2 +- apps/i18n/core/ja/LC_MESSAGES/django.po | 2 +- apps/i18n/core/zh/LC_MESSAGES/django.mo | 2 +- apps/i18n/core/zh/LC_MESSAGES/django.po | 2 +- apps/terminal/serializers/storage.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 1df7ab6a7..477ab5282 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -6943,7 +6943,7 @@ msgstr "" #: terminal/serializers/storage.py:33 #: xpack/plugins/cloud/serializers/account_attrs.py:17 -msgid "Access key id" +msgid "Access key ID" msgstr "" #: terminal/serializers/storage.py:37 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index 2f6208cfd..83fa45717 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:6386a18d95935085c5b31597f5de7f93887f01d7e41a896e28931b6c6b6365b6 +oid sha256:69201f02364e905a7a671a4c841335ef36f0cde08f263c00891ac472033efaf1 size 168785 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index d6a30f2f8..2f87a497d 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -7212,7 +7212,7 @@ msgstr "バケット" #: terminal/serializers/storage.py:33 #: xpack/plugins/cloud/serializers/account_attrs.py:17 -msgid "Access key id" +msgid "Access key ID" msgstr "アクセスキー" #: terminal/serializers/storage.py:37 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index ee6813865..c6d0b6564 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:07fc143922960ec9d8f76f3353c8fc8c74cd8a68f0c52cd27686cdf05fca925d +oid sha256:86fdb677199ef9d4911ec59a16aafd1e2b4b5613d81f8dfbcf477ecc51c2cd24 size 139535 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index a8cb08d25..d100c2b77 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -7053,7 +7053,7 @@ msgstr "桶名称" #: terminal/serializers/storage.py:33 #: xpack/plugins/cloud/serializers/account_attrs.py:17 -msgid "Access key id" +msgid "Access key ID" msgstr "Access key ID(AK)" #: terminal/serializers/storage.py:37 diff --git a/apps/terminal/serializers/storage.py b/apps/terminal/serializers/storage.py index 85f52c609..4aabc8436 100644 --- a/apps/terminal/serializers/storage.py +++ b/apps/terminal/serializers/storage.py @@ -30,7 +30,7 @@ class ReplayStorageTypeBaseSerializer(serializers.Serializer): ) ACCESS_KEY = serializers.CharField( max_length=1024, required=False, allow_blank=True, - label=_('Access key id'), allow_null=True, + label=_('Access key ID'), allow_null=True, ) SECRET_KEY = EncryptedField( max_length=1024, required=False, allow_blank=True, From 9e1a3598ab1cfaaff618bd6de3936152b1f80274 Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 27 Feb 2024 16:43:44 +0800 Subject: [PATCH 14/17] perf: i18n settings-Components done. --- apps/i18n/core/en/LC_MESSAGES/django.mo | 4 ++-- apps/i18n/core/en/LC_MESSAGES/django.po | 14 +++++--------- apps/i18n/core/ja/LC_MESSAGES/django.mo | 4 ++-- apps/i18n/core/ja/LC_MESSAGES/django.po | 16 ++++++---------- apps/i18n/core/zh/LC_MESSAGES/django.mo | 4 ++-- apps/i18n/core/zh/LC_MESSAGES/django.po | 16 ++++++---------- apps/i18n/lina/en.json | 2 +- apps/settings/serializers/terminal.py | 22 +++++++++++----------- 8 files changed, 35 insertions(+), 47 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo index 8b20cef55..30c9d22f0 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:3e91350085ae1a963cd47e161976e8712215648bf46d9f9253c0fdec2f7c9869 -size 2329 +oid sha256:7b33b3fc460342e5c344d08fd5217d0d7abbfece053251332607a93d46b3ffbe +size 2319 diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 477ab5282..1c5af73be 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -5866,7 +5866,7 @@ msgid "Auto" msgstr "" #: settings/serializers/terminal.py:22 -msgid "Enable terminal register" +msgid "Terminal registration" msgstr "" #: settings/serializers/terminal.py:24 @@ -5885,16 +5885,16 @@ msgstr "" #: settings/serializers/terminal.py:30 msgid "" -"Tips: If use other auth method, like AD/LDAP, you should disable this to " +"Information: If use other auth method, like AD/LDAP, you should disable this to " "avoid being able to log in after deleting" msgstr "" #: settings/serializers/terminal.py:34 -msgid "List sort by" +msgid "Asset list sorting" msgstr "" #: settings/serializers/terminal.py:37 -msgid "List page size" +msgid "Asset list page size" msgstr "" #: settings/serializers/terminal.py:39 @@ -5905,10 +5905,6 @@ msgstr "" msgid "Enable Razor" msgstr "" -#: settings/serializers/terminal.py:41 -msgid "Enable SSH Client" -msgstr "" - #: settings/tasks/ldap.py:28 msgid "Periodic import ldap user" msgstr "" @@ -7801,7 +7797,7 @@ msgid "Is OTP bound" msgstr "OTP bound" #: users/serializers/user.py:101 -msgid "Can public key authentication" +msgid "Can public key auth" msgstr "Public key auth" #: users/serializers/user.py:166 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index 83fa45717..8001a7f6d 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:69201f02364e905a7a671a4c841335ef36f0cde08f263c00891ac472033efaf1 -size 168785 +oid sha256:b5e7d67f20f1f3dcfe596a68a54e9c8228218ad4dfabed4c9439ebcd675df605 +size 168686 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 2f87a497d..17bbc97b9 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -6075,7 +6075,7 @@ msgid "Auto" msgstr "自動" #: settings/serializers/terminal.py:22 -msgid "Enable terminal register" +msgid "Terminal registration" msgstr "ターミナルレジスタの有効化" #: settings/serializers/terminal.py:24 @@ -6096,18 +6096,18 @@ msgstr "鍵認証" #: settings/serializers/terminal.py:30 msgid "" -"Tips: If use other auth method, like AD/LDAP, you should disable this to " +"Information: If use other auth method, like AD/LDAP, you should disable this to " "avoid being able to log in after deleting" msgstr "" "ヒント: AD/LDAPなどの他の認証方法を使用する場合は、サードパーティ製システムの" "削除後にこの項目を無効にする必要があります, ログインも可能" #: settings/serializers/terminal.py:34 -msgid "List sort by" +msgid "Asset list sorting" msgstr "リストの並べ替え" #: settings/serializers/terminal.py:37 -msgid "List page size" +msgid "Asset list page size" msgstr "ページサイズを一覧表示" #: settings/serializers/terminal.py:39 @@ -6119,7 +6119,7 @@ msgid "Enable Razor" msgstr "Razor の有効化" #: settings/serializers/terminal.py:41 -msgid "Enable SSH Client" +msgid "SSH Client" msgstr "SSH Clientの有効化" #: settings/tasks/ldap.py:28 @@ -6540,10 +6540,6 @@ msgstr "出力" msgid "Risk level" msgstr "リスクレベル" -#: terminal/connect_methods.py:29 -msgid "SSH Client" -msgstr "SSH クライアント" - #: terminal/connect_methods.py:30 msgid "SSH Guide" msgstr "SSH ガイド人" @@ -8106,7 +8102,7 @@ msgid "Is OTP bound" msgstr "仮想MFAがバインドされているか" #: users/serializers/user.py:101 -msgid "Can public key authentication" +msgid "Can public key auth" msgstr "公開鍵認証が可能" #: users/serializers/user.py:166 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index c6d0b6564..ea0448de9 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:86fdb677199ef9d4911ec59a16aafd1e2b4b5613d81f8dfbcf477ecc51c2cd24 -size 139535 +oid sha256:ea00888ff29f180282bd67dd84e912d02184698ab75da63803c11352240f373a +size 139493 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index d100c2b77..e656bca78 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -5937,7 +5937,7 @@ msgid "Auto" msgstr "自动" #: settings/serializers/terminal.py:22 -msgid "Enable terminal register" +msgid "Terminal registration" msgstr "组件注册" #: settings/serializers/terminal.py:24 @@ -5956,18 +5956,18 @@ msgstr "密钥认证" #: settings/serializers/terminal.py:30 msgid "" -"Tips: If use other auth method, like AD/LDAP, you should disable this to " +"Information: If use other auth method, like AD/LDAP, you should disable this to " "avoid being able to log in after deleting" msgstr "" "提示：如果你使用其它认证方式，如 AD/LDAP，你应该禁用此项，以避免第三方系统删" "除后，还可以登录" #: settings/serializers/terminal.py:34 -msgid "List sort by" +msgid "Asset list sorting" msgstr "资产列表排序" #: settings/serializers/terminal.py:37 -msgid "List page size" +msgid "Asset list page size" msgstr "资产列表每页数量" #: settings/serializers/terminal.py:39 @@ -5979,7 +5979,7 @@ msgid "Enable Razor" msgstr "启用 Razor 服务" #: settings/serializers/terminal.py:41 -msgid "Enable SSH Client" +msgid "SSH Client" msgstr "启用 SSH Client" #: settings/tasks/ldap.py:28 @@ -6388,10 +6388,6 @@ msgstr "输出" msgid "Risk level" msgstr "风险等级" -#: terminal/connect_methods.py:29 -msgid "SSH Client" -msgstr "SSH 客户端" - #: terminal/connect_methods.py:30 msgid "SSH Guide" msgstr "SSH 向导" @@ -7924,7 +7920,7 @@ msgid "Is OTP bound" msgstr "是否绑定了虚拟 MFA" #: users/serializers/user.py:101 -msgid "Can public key authentication" +msgid "Can public key auth" msgstr "可以使用公钥认证" #: users/serializers/user.py:166 diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index efe5992d9..5907ac024 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -261,7 +261,7 @@ "CommentHelpText": "Note: Remarks will be displayed when hovered over in the Luna page's user authorization asset tree. Ordinary users can view, please do not fill in sensitive information.", "CommunityEdition": "Community Version", "Component": "Component", - "ComponentMonitor": "Component Monitoring", + "ComponentMonitor": "Monitoring", "ConceptContent": "I want you to act like a Python interpreter. I will give you Python code, and you will execute it. Do not provide any explanations. Respond with nothing except the output of the code.", "ConceptTitle": "🤔 Python Interpreter", "Config": "Settings", diff --git a/apps/settings/serializers/terminal.py b/apps/settings/serializers/terminal.py index 42e03eeb7..e69910add 100644 --- a/apps/settings/serializers/terminal.py +++ b/apps/settings/serializers/terminal.py @@ -6,8 +6,8 @@ class TerminalSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('Terminal') SORT_BY_CHOICES = ( - ('name', _('Hostname')), - ('ip', _('IP')) + ('name', _('Name')), + ('ip', _('Address')) ) PAGE_SIZE_CHOICES = ( @@ -19,23 +19,23 @@ class TerminalSettingSerializer(serializers.Serializer): ('50', '50'), ) SECURITY_SERVICE_ACCOUNT_REGISTRATION = serializers.BooleanField( - required=True, label=_('Enable terminal register'), + required=True, label=_('Terminal registration'), help_text=_( "Allow terminal register, after all terminal setup, you should disable this for security" ) ) - TERMINAL_PASSWORD_AUTH = serializers.BooleanField(required=False, label=_('Password auth')) + TERMINAL_PASSWORD_AUTH = serializers.BooleanField(required=False, label=_("Password auth")) TERMINAL_PUBLIC_KEY_AUTH = serializers.BooleanField( - required=False, label=_('Public key auth'), - help_text=_('Tips: If use other auth method, like AD/LDAP, you should disable this to ' + required=False, label=_("public key auth"), + help_text=_('Information: If use other auth method, like AD/LDAP, you should disable this to ' 'avoid being able to log in after deleting') ) TERMINAL_ASSET_LIST_SORT_BY = serializers.ChoiceField( - SORT_BY_CHOICES, required=False, label=_('List sort by') + SORT_BY_CHOICES, required=False, label=_('Asset list sorting') ) TERMINAL_ASSET_LIST_PAGE_SIZE = serializers.ChoiceField( - PAGE_SIZE_CHOICES, required=False, label=_('List page size') + PAGE_SIZE_CHOICES, required=False, label=_('Asset list page size') ) - TERMINAL_MAGNUS_ENABLED = serializers.BooleanField(label=_("Enable database proxy")) - TERMINAL_RAZOR_ENABLED = serializers.BooleanField(label=_("Enable Razor")) - TERMINAL_KOKO_SSH_ENABLED = serializers.BooleanField(label=_("Enable SSH Client")) + TERMINAL_MAGNUS_ENABLED = serializers.BooleanField(label="Magnus") + TERMINAL_RAZOR_ENABLED = serializers.BooleanField(label="Razor") + TERMINAL_KOKO_SSH_ENABLED = serializers.BooleanField(label="Koko") From 000c5770f2e38266422b9154c342612fd23a7dc7 Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 27 Feb 2024 17:13:59 +0800 Subject: [PATCH 15/17] perf: i18n settings-RemoteApp done. --- apps/i18n/lina/en.json | 6 +++--- apps/i18n/luna/en.json | 2 +- apps/i18n/luna/zh.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 5907ac024..b04c1f52f 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -83,15 +83,15 @@ "AppOps": "Job center", "AppProvider": "Application Providers", "AppProviderDetail": "Application Provider Details", - "AppletDetail": "Remote Apps", + "AppletDetail": "RemoteApp", "AppletHelpText": "In the upload process, if the application does not exist, create the application; If it exists, update the application.", "AppletHostCreate": "Add Remote Application Release Machine", "AppletHostDetail": "Remote Application Publishing Machine Details", "AppletHostDomainHelpText": "This domain belongs to the System Organization", "AppletHostSelectHelpMessage": "When connecting to an asset, the selection of the application publishing machine is random (but the last used one is preferred). If you want to assign a specific publishing machine to an asset, you can tag it as or ;
When selecting an account for the publishing machine, the following situations will choose the user's own account with the same name or proprietary account (starting with js), otherwise use a public account (starting with jms):
  1. Both the publishing machine and application support concurrent;
  2. The publishing machine supports concurrent, but the application does not, and the current application does not use a proprietary account;
  3. The publishing machine does not support concurrent, the application either supports or does not support concurrent, and no application uses a proprietary account;
Note: Whether the application supports concurrent connections is decided by the developer, and whether the host supports concurrent connections is decided by the single user single session setting in the publishing machine configuration", "AppletHostUpdate": "Update Remote App Publishing Machine", - "AppletHosts": "Remote App Machine", - "Applets": "Remote Apps", + "AppletHosts": "RemoteApp machine", + "Applets": "RemoteApp", "Applicant": "Applicant", "Applications": "Assets", "ApplyAsset": "Apply for Assets", diff --git a/apps/i18n/luna/en.json b/apps/i18n/luna/en.json index 8d3cae2a1..2b6a9f6d5 100644 --- a/apps/i18n/luna/en.json +++ b/apps/i18n/luna/en.json @@ -140,7 +140,7 @@ "Refresh": "Refresh", "Remember password": "Remember me", "Remember select": "Remember selected", - "Remote apps": "Remote apps", + "RemoteApp": "RemoteApp", "Reselect connection method": "Reselect asset connection method", "Resume": "Resume", "Resume task has been send": "Resume task has been send", diff --git a/apps/i18n/luna/zh.json b/apps/i18n/luna/zh.json index 2c5b9f527..91c1930db 100644 --- a/apps/i18n/luna/zh.json +++ b/apps/i18n/luna/zh.json @@ -138,7 +138,7 @@ "Refresh": "刷新", "Remember password": "记住密码", "Remember select": "记住选择", - "Remote apps": "远程应用", + "RemoteApp": "远程应用", "Reselect connection method": "可重新选择连接方式", "Resume": "恢复", "Resume task has been send": "恢复任务已发送", From 2328ef0b0c18e3e34f4816a0f4136350ee8da2a5 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 27 Feb 2024 19:17:40 +0800 Subject: [PATCH 16/17] perf: account translate (#12719) Co-authored-by: feng <1304903146@qq.com> --- apps/i18n/lina/en.json | 15 +++------------ apps/i18n/lina/zh.json | 11 +---------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index b04c1f52f..9ba39b385 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -6,29 +6,20 @@ "AccessKey": "Access Key", "Account": "Account", "AccountBackup": "Account Backup", - "AccountBackupCreate": "Create Account Backup", - "AccountBackupUpdate": "Update Account Backup", - "AccountChangeSecret": "Password Change", - "AccountCreate": "Create Account", + "AccountChangeSecret": "Change Secret", "AccountDeleteConfirmMsg": "Delete Account, continue?", - "AccountDetail": "Account Details", "AccountExportTips": "The exported information contains sensitive information such as encrypted account numbers. The exported format is an encrypted zip file (if you have not set the encryption password, please go to Personal Info to set the file encryption password).", "AccountGatherList": "Collection Task", - "AccountGatherTaskCreate": "Create Task", "AccountGatherTaskList": "Account Collect", - "AccountGatherTaskUpdate": "Update Task", "AccountList": "Cloud Account", "AccountPolicy": "Account Policy", - "AccountPushCreate": "Create Account Push", "AccountPushExecutionList": "Execute History", "AccountPushList": "Account Push", - "AccountPushUpdate": "Update Account Push", "AccountStorage": "Account", "HistoryRecord": "History record", "AccountTemplate": "Template", "AccountTemplateList": "Templates", "AccountTemplateUpdateSecretHelpText": "The account list shows the accounts created through the template. When the secret is updated, the ciphertext of the accounts created through the template will be updated.", - "AccountUpdate": "Update Account", "Accounts": "Account", "Action": "Action", "ActionCount": "Actions", @@ -43,7 +34,6 @@ "ActiveUser": "Logged in recently", "Activity": "Activities", "Add": "Add", - "AddAccount": "Add Account", "AddAccountResult": "Second-Level Approver", "AddAllMembersWarningMsg": "Are you sure you want to add all members?", "AddAsset": "Add Assets", @@ -160,6 +150,7 @@ "AverageTimeCost": "Average spend time", "Azure": "Azure (China)", "Backup": "Backup", + "BatchTest": "Batch Test", "BadConflictErrorMsg": "Refreshing, please try again later", "BadRequestErrorMsg": "Request Error, please check the filled content", "BadRoleErrorMsg": "Request Error, No Permission for this Action", @@ -220,7 +211,7 @@ "Cleaning": "Regular Clean-up", "Clear": "Clear", "ClearScreen": "Clear Screen", - "ClearSecret": "Clear selected secret", + "ClearSecret": "Clear secret", "ClearSelection": "Clear Selection", "ClearSuccessMsg": "Clear Successful", "ClickCopy": "Click to Copy", diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index f75b62f37..6b6056ff9 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -6,27 +6,18 @@ "AccessKey": "访问密钥", "Account": "账号信息", "AccountBackup": "账号备份", - "AccountBackupCreate": "创建账号备份", - "AccountBackupUpdate": "更新账号备份", "AccountChangeSecret": "账号改密", - "AccountCreate": "创建账户", "AccountDeleteConfirmMsg": "删除账号，是否继续？", - "AccountDetail": "账户详情", "AccountExportTips": "导出信息中包含账号密文涉及敏感信息，导出的格式为一个加密的zip文件（若没有设置加密密码，请前往个人信息中设置文件加密密码）。", "AccountGatherList": "收集任务", - "AccountGatherTaskCreate": "创建任务", "AccountGatherTaskList": "账号收集", - "AccountGatherTaskUpdate": "更新任务", "AccountList": "云账号", "AccountPolicy": "账号策略", - "AccountPushCreate": "创建账号推送", "AccountPushExecutionList": "执行列表", "AccountPushList": "账号推送", - "AccountPushUpdate": "账号推送更新", "AccountStorage": "账号存储", "AccountTemplate": "账号模版", "AccountTemplateUpdateSecretHelpText": "账号列表展示通过模版创建的账号。更新密文时，会更新通过模版所创建账号的密文。", - "AccountUpdate": "更新账户", "Accounts": "账号管理", "Action": "动作", "ActionCount": "动作数量", @@ -40,7 +31,6 @@ "ActiveUser": "近期登录过", "Activity": "活动", "Add": "新增", - "AddAccount": "添加账号", "AddAccountResult": "账号批量添加结果", "AddAllMembersWarningMsg": "你确定要添加全部成员？", "AddAsset": "添加资产", @@ -157,6 +147,7 @@ "AverageTimeCost": "平均花费时间", "Azure": "Azure(中国)", "Backup": "备份", + "BatchTest": "批量测试", "BadConflictErrorMsg": "正在刷新中，请稍后再试", "BadRequestErrorMsg": "请求错误，请检查填写内容", "BadRoleErrorMsg": "请求错误，无该操作权限", From e3088124292b3f59dc09ff5d410691a51782bae4 Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 27 Feb 2024 19:20:41 +0800 Subject: [PATCH 17/17] perf: i18n settings-Security done. --- apps/i18n/core/en/LC_MESSAGES/django.po | 46 ++++++++++--------------- apps/i18n/core/ja/LC_MESSAGES/django.mo | 4 +-- apps/i18n/core/ja/LC_MESSAGES/django.po | 46 ++++++++++--------------- apps/i18n/core/zh/LC_MESSAGES/django.mo | 4 +-- apps/i18n/core/zh/LC_MESSAGES/django.po | 46 ++++++++++--------------- apps/i18n/lina/en.json | 12 +++---- apps/settings/serializers/security.py | 42 +++++++++++----------- 7 files changed, 88 insertions(+), 112 deletions(-) diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 1c5af73be..7682a5ceb 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -5609,7 +5609,7 @@ msgid "" msgstr "" #: settings/serializers/security.py:26 -msgid "Number of repeated historical passwords" +msgid "Recent password count" msgstr "" #: settings/serializers/security.py:28 @@ -5619,27 +5619,27 @@ msgid "" msgstr "" #: settings/serializers/security.py:34 -msgid "Password minimum length" +msgid "Minimum length (User)" msgstr "" #: settings/serializers/security.py:38 -msgid "Admin user password minimum length" +msgid "Minimum length (Admin)" msgstr "" #: settings/serializers/security.py:41 -msgid "Must contain capital" +msgid "Uppercase" msgstr "" #: settings/serializers/security.py:44 -msgid "Must contain lowercase" +msgid "Lowercase" msgstr "" #: settings/serializers/security.py:47 -msgid "Must contain numeric" +msgid "Digits" msgstr "" #: settings/serializers/security.py:50 -msgid "Must contain special" +msgid "Special characters" msgstr "" #: settings/serializers/security.py:55 @@ -5649,27 +5649,19 @@ msgid "" msgstr "" #: settings/serializers/security.py:63 -msgid "Limit the number of user login failures" -msgstr "" - -#: settings/serializers/security.py:67 -msgid "Block user login interval (minute)" -msgstr "" - -#: settings/serializers/security.py:73 -msgid "Limit the number of IP login failures" +msgid "Login failures count" msgstr "" #: settings/serializers/security.py:77 -msgid "Block IP login interval (minute)" +msgid "Login failure period (minute)" msgstr "" #: settings/serializers/security.py:81 -msgid "Login IP White List" +msgid "Login IP whitelist" msgstr "" #: settings/serializers/security.py:86 -msgid "Login IP Black List" +msgid "Login IP blacklist" msgstr "" #: settings/serializers/security.py:91 @@ -5723,7 +5715,7 @@ msgid "Global MFA auth" msgstr "" #: settings/serializers/security.py:124 -msgid "Third-party login users perform MFA authentication" +msgid "Third-party login MFA" msgstr "" #: settings/serializers/security.py:125 @@ -5765,7 +5757,7 @@ msgid "Reset password and send SMS code expiration time" msgstr "" #: settings/serializers/security.py:153 -msgid "Enable Login dynamic code" +msgid "Login dynamic code" msgstr "" #: settings/serializers/security.py:154 @@ -5775,7 +5767,7 @@ msgid "" msgstr "" #: settings/serializers/security.py:158 -msgid "Enable Login captcha" +msgid "Login captcha" msgstr "" #: settings/serializers/security.py:159 @@ -5783,7 +5775,7 @@ msgid "Enable captcha to prevent robot authentication" msgstr "" #: settings/serializers/security.py:162 -msgid "Remote Login Protection" +msgid "Suspicious Login Verification" msgstr "" #: settings/serializers/security.py:164 @@ -5794,7 +5786,7 @@ msgid "" msgstr "" #: settings/serializers/security.py:170 -msgid "Unused user timeout (day)" +msgid "Auto Disable Threshold (day)" msgstr "" #: settings/serializers/security.py:171 @@ -5804,7 +5796,7 @@ msgid "" msgstr "" #: settings/serializers/security.py:191 -msgid "Enable watermark" +msgid "Watermark" msgstr "" #: settings/serializers/security.py:192 @@ -5812,7 +5804,7 @@ msgid "Enabled, the web session and replay contains watermark information" msgstr "" #: settings/serializers/security.py:196 -msgid "Connection max idle time (minute)" +msgid "Max idle time (minute)" msgstr "" #: settings/serializers/security.py:197 @@ -5820,7 +5812,7 @@ msgid "If idle time more than it, disconnect connection." msgstr "" #: settings/serializers/security.py:201 -msgid "Session max connection time (hour)" +msgid "Max online time (hour)" msgstr "" #: settings/serializers/security.py:202 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index 8001a7f6d..4d44387a3 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:b5e7d67f20f1f3dcfe596a68a54e9c8228218ad4dfabed4c9439ebcd675df605 -size 168686 +oid sha256:6927f54b75facae0524e9d6cd4d021104780d96cdc128880f6e960ed72fb4ae5 +size 168378 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 17bbc97b9..ca35fb4a8 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -5797,7 +5797,7 @@ msgstr "" "れます。" #: settings/serializers/security.py:26 -msgid "Number of repeated historical passwords" +msgid "Recent password count" msgstr "繰り返された履歴パスワードの数" #: settings/serializers/security.py:28 @@ -5809,27 +5809,27 @@ msgstr "" "にすることはできません" #: settings/serializers/security.py:34 -msgid "Password minimum length" +msgid "Minimum length (User)" msgstr "パスワードの最小長" #: settings/serializers/security.py:38 -msgid "Admin user password minimum length" +msgid "Minimum length (Admin)" msgstr "管理者ユーザーパスワードの最小長" #: settings/serializers/security.py:41 -msgid "Must contain capital" +msgid "Uppercase" msgstr "資本を含める必要があります" #: settings/serializers/security.py:44 -msgid "Must contain lowercase" +msgid "Lowercase" msgstr "小文字を含める必要があります。" #: settings/serializers/security.py:47 -msgid "Must contain numeric" +msgid "Digits" msgstr "数値を含める必要があります" #: settings/serializers/security.py:50 -msgid "Must contain special" +msgid "Special characters" msgstr "特別な" #: settings/serializers/security.py:55 @@ -5841,27 +5841,19 @@ msgstr "" "はできません。" #: settings/serializers/security.py:63 -msgid "Limit the number of user login failures" +msgid "Login failures count" msgstr "ユーザーログインの失敗数を制限する" #: settings/serializers/security.py:67 -msgid "Block user login interval (minute)" +msgid "Login failure period (minute)" msgstr "ユーザーのログイン間隔をブロックする（分）" -#: settings/serializers/security.py:73 -msgid "Limit the number of IP login failures" -msgstr "IPログイン失敗の数を制限する" - -#: settings/serializers/security.py:77 -msgid "Block IP login interval (minute)" -msgstr "IPログイン間隔をブロックする（分）" - #: settings/serializers/security.py:81 -msgid "Login IP White List" +msgid "Login IP whitelist" msgstr "ログインIPホワイトリスト" #: settings/serializers/security.py:86 -msgid "Login IP Black List" +msgid "Login IP blacklist" msgstr "ログインIPブラックリスト" #: settings/serializers/security.py:91 @@ -5923,7 +5915,7 @@ msgid "Global MFA auth" msgstr "グローバル有効化MFA認証" #: settings/serializers/security.py:124 -msgid "Third-party login users perform MFA authentication" +msgid "Third-party login MFA" msgstr "サードパーティのログインユーザーがMFA認証を実行" #: settings/serializers/security.py:125 @@ -5966,7 +5958,7 @@ msgid "Reset password and send SMS code expiration time" msgstr "パスワードをリセットしてSMSコードの有効期限を送信します" #: settings/serializers/security.py:153 -msgid "Enable Login dynamic code" +msgid "Login dynamic code" msgstr "ログイン動的コードの有効化" #: settings/serializers/security.py:154 @@ -5978,7 +5970,7 @@ msgstr "" "ます" #: settings/serializers/security.py:158 -msgid "Enable Login captcha" +msgid "Login captcha" msgstr "ログインcaptchaの有効化" #: settings/serializers/security.py:159 @@ -5986,7 +5978,7 @@ msgid "Enable captcha to prevent robot authentication" msgstr "Captchaを有効にしてロボット認証を防止する" #: settings/serializers/security.py:162 -msgid "Remote Login Protection" +msgid "Suspicious Login Verification" msgstr "リモートログイン保護" #: settings/serializers/security.py:164 @@ -6000,7 +5992,7 @@ msgstr "" "モートログインリマインダーを送信します" #: settings/serializers/security.py:170 -msgid "Unused user timeout (day)" +msgid "Auto Disable Threshold (day)" msgstr "未使用のユーザータイムアウト（日）" #: settings/serializers/security.py:171 @@ -6012,7 +6004,7 @@ msgstr "" "します。" #: settings/serializers/security.py:191 -msgid "Enable watermark" +msgid "Watermark" msgstr "透かしの有効化" #: settings/serializers/security.py:192 @@ -6020,7 +6012,7 @@ msgid "Enabled, the web session and replay contains watermark information" msgstr "Webセッションとリプレイには透かし情報が含まれています。" #: settings/serializers/security.py:196 -msgid "Connection max idle time (minute)" +msgid "Max idle time (minute)" msgstr "接続最大アイドル時間（分）" #: settings/serializers/security.py:197 @@ -6028,7 +6020,7 @@ msgid "If idle time more than it, disconnect connection." msgstr "この設定以上の操作がない場合、接続は切断されます" #: settings/serializers/security.py:201 -msgid "Session max connection time (hour)" +msgid "Max online time (hour)" msgstr "セッション最大接続時間（時間）" #: settings/serializers/security.py:202 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index ea0448de9..79faccfcd 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:ea00888ff29f180282bd67dd84e912d02184698ab75da63803c11352240f373a -size 139493 +oid sha256:7422fdff60206636c98e63ee17b1b509d7d6678c95379163e6279c3e55e27eb4 +size 139220 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index e656bca78..db942d08a 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -5672,7 +5672,7 @@ msgstr "" "期前5天内由系统 (每天)自动发送给用户" #: settings/serializers/security.py:26 -msgid "Number of repeated historical passwords" +msgid "Recent password count" msgstr "不能设置近几次密码" #: settings/serializers/security.py:28 @@ -5682,27 +5682,27 @@ msgid "" msgstr "提示：用户重置密码时，不能为该用户前几次使用过的密码" #: settings/serializers/security.py:34 -msgid "Password minimum length" +msgid "Minimum length (User)" msgstr "密码最小长度" #: settings/serializers/security.py:38 -msgid "Admin user password minimum length" +msgid "Minimum length (Admin)" msgstr "管理员密码最小长度" #: settings/serializers/security.py:41 -msgid "Must contain capital" +msgid "Uppercase" msgstr "必须包含大写字符" #: settings/serializers/security.py:44 -msgid "Must contain lowercase" +msgid "Lowercase" msgstr "必须包含小写字符" #: settings/serializers/security.py:47 -msgid "Must contain numeric" +msgid "Digits" msgstr "必须包含数字" #: settings/serializers/security.py:50 -msgid "Must contain special" +msgid "Special characters" msgstr "必须包含特殊字符" #: settings/serializers/security.py:55 @@ -5712,27 +5712,19 @@ msgid "" msgstr "当用户登录失败次数达到限制后，那么在此间隔内禁止登录" #: settings/serializers/security.py:63 -msgid "Limit the number of user login failures" +msgid "Login failures count" msgstr "限制用户登录失败次数" #: settings/serializers/security.py:67 -msgid "Block user login interval (minute)" +msgid "Login failure period (minute)" msgstr "禁止用户登录间隔 (分)" -#: settings/serializers/security.py:73 -msgid "Limit the number of IP login failures" -msgstr "限制 IP 登录失败次数" - -#: settings/serializers/security.py:77 -msgid "Block IP login interval (minute)" -msgstr "禁止 IP 登录间隔 (分)" - #: settings/serializers/security.py:81 -msgid "Login IP White List" +msgid "Login IP whitelist" msgstr "IP 登录白名单" #: settings/serializers/security.py:86 -msgid "Login IP Black List" +msgid "Login IP blacklist" msgstr "IP 登录黑名单" #: settings/serializers/security.py:91 @@ -5790,7 +5782,7 @@ msgid "Global MFA auth" msgstr "全局启用 MFA 认证" #: settings/serializers/security.py:124 -msgid "Third-party login users perform MFA authentication" +msgid "Third-party login MFA" msgstr "第三方认证开启 MFA" #: settings/serializers/security.py:125 @@ -5832,7 +5824,7 @@ msgid "Reset password and send SMS code expiration time" msgstr "重置密码的验证码及发送短信的验证码过期时间" #: settings/serializers/security.py:153 -msgid "Enable Login dynamic code" +msgid "Login dynamic code" msgstr "启用登录附加码" #: settings/serializers/security.py:154 @@ -5844,7 +5836,7 @@ msgstr "" "码+6位数字 完成认证" #: settings/serializers/security.py:158 -msgid "Enable Login captcha" +msgid "Login captcha" msgstr "启用登录验证码" #: settings/serializers/security.py:159 @@ -5852,7 +5844,7 @@ msgid "Enable captcha to prevent robot authentication" msgstr "开启验证码，防止机器人登录" #: settings/serializers/security.py:162 -msgid "Remote Login Protection" +msgid "Suspicious Login Verification" msgstr "异地登录通知" #: settings/serializers/security.py:164 @@ -5865,7 +5857,7 @@ msgstr "" "登录提醒" #: settings/serializers/security.py:170 -msgid "Unused user timeout (day)" +msgid "Auto Disable Threshold (day)" msgstr "不活跃用户自动禁用 (天)" #: settings/serializers/security.py:171 @@ -5875,7 +5867,7 @@ msgid "" msgstr "每天检测一次，超过预设时间的用户自动禁用" #: settings/serializers/security.py:191 -msgid "Enable watermark" +msgid "Watermark" msgstr "开启水印" #: settings/serializers/security.py:192 @@ -5883,7 +5875,7 @@ msgid "Enabled, the web session and replay contains watermark information" msgstr "启用后，Web 会话和录像将包含水印信息" #: settings/serializers/security.py:196 -msgid "Connection max idle time (minute)" +msgid "Max idle time (minute)" msgstr "连接最大空闲时间 (分)" #: settings/serializers/security.py:197 @@ -5891,7 +5883,7 @@ msgid "If idle time more than it, disconnect connection." msgstr "提示：如果超过该配置没有操作，连接会被断开" #: settings/serializers/security.py:201 -msgid "Session max connection time (hour)" +msgid "Max online time (hour)" msgstr "会话连接最大时间 (时)" #: settings/serializers/security.py:202 diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 9ba39b385..f7b08f73b 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -136,11 +136,11 @@ "AttrValue": "Attribute value", "Audits": "Audit", "Auth": "Authentication", - "AuthLimit": "Login Restrictions", + "AuthLimit": "Login restriction", "AuthSAMLCertHelpText": "Save after uploading the certificate key, then view SP Metadata", "AuthSAMLKeyHelpText": "SP Certificates and keys are used for encrypted communication with IDP", "AuthSaml2UserAttrMapHelpText": "The keys on the left are SAML2 user attributes, the values on the right are authentication platform user attributes", - "AuthSecurity": "Authentication Security", + "AuthSecurity": "User Login", "AuthSetting": "Authentication", "AuthSettings": "Authentication Configuration", "AuthUserAttrMapHelpText": "The Key on the Left Belongs to the JumpServer User Properties, and the Value on the Right Belongs to the Authentication Platform User Properties", @@ -492,7 +492,7 @@ "IAgree": "I agree", "ID": "ID", "IP": "IP", - "IPLoginLimit": "IP Login Restrictions", + "IPLoginLimit": "IP restriction", "IPMatch": "IP Matching", "IPNetworkSegment": "IP Segment", "Id": "ID", @@ -733,7 +733,7 @@ "PasswordPlaceholder": "Please Enter Password", "PasswordRecord": "Password Record", "PasswordRule": "Password Rules", - "PasswordSecurity": "Password Security", + "PasswordSecurity": "User Password", "PasswordStrategy": "Secret Strategy", "PasswordWillExpiredPrefixMsg": "Password will be in", "PasswordWillExpiredSuffixMsg": "It will expire in days, please change your password as soon as possible.", @@ -960,7 +960,7 @@ "SessionMonitor": "Monitor", "SessionOffline": "Historical Sessions", "SessionOnline": "Online Sessions", - "SessionSecurity": "Session security", + "SessionSecurity": "Asset Session", "SessionState": "Session Status", "SessionTerminate": "Session Termination", "SessionTrend": "Session Trends", @@ -1165,7 +1165,7 @@ "UserLoginAclDetail": "User Login Control Details", "UserLoginAclList": "User Login ACL", "UserLoginAclUpdate": "Update User Login Control", - "UserLoginLimit": "User Login Restriction", + "UserLoginLimit": "User Restriction", "UserLoginTrend": "Account Login Trend", "UserProfile": "Personal Information", "UserSession": "User Sessions", diff --git a/apps/settings/serializers/security.py b/apps/settings/serializers/security.py index 1fca3be3d..7685eaba6 100644 --- a/apps/settings/serializers/security.py +++ b/apps/settings/serializers/security.py @@ -23,7 +23,7 @@ class SecurityPasswordRuleSerializer(serializers.Serializer): ) OLD_PASSWORD_HISTORY_LIMIT_COUNT = serializers.IntegerField( min_value=0, max_value=99999, required=True, - label=_('Number of repeated historical passwords'), + label=_('Recent password count'), help_text=_( 'Tip: When the user resets the password, it cannot be ' 'the previous n historical passwords of the user' @@ -31,23 +31,23 @@ class SecurityPasswordRuleSerializer(serializers.Serializer): ) SECURITY_PASSWORD_MIN_LENGTH = serializers.IntegerField( min_value=6, max_value=30, required=True, - label=_('Password minimum length') + label=_("Minimum length (User)") ) SECURITY_ADMIN_USER_PASSWORD_MIN_LENGTH = serializers.IntegerField( min_value=6, max_value=30, required=True, - label=_('Admin user password minimum length') + label=_('Minimum length (Admin)') ) SECURITY_PASSWORD_UPPER_CASE = serializers.BooleanField( - required=False, label=_('Must contain capital') + required=False, label=_('Uppercase') ) SECURITY_PASSWORD_LOWER_CASE = serializers.BooleanField( - required=False, label=_('Must contain lowercase') + required=False, label=_('Lowercase') ) SECURITY_PASSWORD_NUMBER = serializers.BooleanField( - required=False, label=_('Must contain numeric') + required=False, label=_('Digits') ) SECURITY_PASSWORD_SPECIAL_CHAR = serializers.BooleanField( - required=False, label=_('Must contain special') + required=False, label=_('Special characters') ) @@ -60,30 +60,30 @@ login_ip_limit_time_help_text = _( class SecurityLoginLimitSerializer(serializers.Serializer): SECURITY_LOGIN_LIMIT_COUNT = serializers.IntegerField( min_value=3, max_value=99999, - label=_('Limit the number of user login failures') + label=_('Login failures count') ) SECURITY_LOGIN_LIMIT_TIME = serializers.IntegerField( min_value=5, max_value=99999, required=True, - label=_('Block user login interval (minute)'), + label=_('Login failure period (minute)'), help_text=login_ip_limit_time_help_text ) SECURITY_LOGIN_IP_LIMIT_COUNT = serializers.IntegerField( min_value=3, max_value=99999, - label=_('Limit the number of IP login failures') + label=_('Login failures count') ) SECURITY_LOGIN_IP_LIMIT_TIME = serializers.IntegerField( min_value=5, max_value=99999, required=True, - label=_('Block IP login interval (minute)'), + label=_('Login failure period (minute)'), help_text=login_ip_limit_time_help_text ) SECURITY_LOGIN_IP_WHITE_LIST = serializers.ListField( - default=[], label=_('Login IP White List'), allow_empty=True, + default=[], label=_('Login IP whitelist'), allow_empty=True, child=serializers.CharField(max_length=1024, validators=[ip_group_child_validator]), help_text=ip_group_help_text ) SECURITY_LOGIN_IP_BLACK_LIST = serializers.ListField( - default=[], label=_('Login IP Black List'), allow_empty=True, + default=[], label=_('Login IP blacklist'), allow_empty=True, child=serializers.CharField(max_length=1024, validators=[ip_group_child_validator]), help_text=ip_group_help_text ) @@ -121,7 +121,7 @@ class SecurityAuthSerializer(serializers.Serializer): ) SECURITY_MFA_AUTH_ENABLED_FOR_THIRD_PARTY = serializers.BooleanField( required=False, default=True, - label=_('Third-party login users perform MFA authentication'), + label=_('Third-party login MFA'), help_text=_('The third-party login modes include OIDC, CAS, and SAML2'), ) OTP_ISSUER_NAME = serializers.CharField( @@ -150,16 +150,16 @@ class SecurityAuthSerializer(serializers.Serializer): ) SECURITY_LOGIN_CHALLENGE_ENABLED = serializers.BooleanField( required=False, default=False, - label=_("Enable Login dynamic code"), + label=_("Login dynamic code"), help_text=_("The password and additional code are sent to a third party " "authentication system for verification") ) SECURITY_LOGIN_CAPTCHA_ENABLED = serializers.BooleanField( - required=False, default=False, label=_("Enable Login captcha"), + required=False, default=False, label=_("Login captcha"), help_text=_("Enable captcha to prevent robot authentication") ) SECURITY_CHECK_DIFFERENT_CITY_LOGIN = serializers.BooleanField( - required=False, label=_('Remote Login Protection'), + required=False, label=_('Suspicious Login Verification'), help_text=_( 'The system determines whether the login IP address belongs to a common login city. ' 'If the account is logged in from a common login city, the system sends a remote login reminder' @@ -167,7 +167,7 @@ class SecurityAuthSerializer(serializers.Serializer): ) SECURITY_UNCOMMON_USERS_TTL = serializers.IntegerField( min_value=30, max_value=99999, required=False, - label=_('Unused user timeout (day)'), + label=_('Auto Disable Threshold (day)'), help_text=_("Detect infrequent users daily and disable them if they exceed the predetermined time limit.") ) @@ -188,17 +188,17 @@ class SecurityAuthSerializer(serializers.Serializer): class SecuritySessionSerializer(serializers.Serializer): SECURITY_WATERMARK_ENABLED = serializers.BooleanField( - required=True, label=_('Enable watermark'), + required=True, label=_('Watermark'), help_text=_('Enabled, the web session and replay contains watermark information') ) SECURITY_MAX_IDLE_TIME = serializers.IntegerField( min_value=1, max_value=99999, required=False, - label=_('Connection max idle time (minute)'), + label=_('Max idle time (minute)'), help_text=_('If idle time more than it, disconnect connection.') ) SECURITY_MAX_SESSION_TIME = serializers.IntegerField( min_value=1, max_value=99999, required=False, - label=_('Session max connection time (hour)'), + label=_('Max online time (hour)'), help_text=_('If session connection time more than it, disconnect connection.') ) SECURITY_LUNA_REMEMBER_AUTH = serializers.BooleanField(