From fdaec3c959727798d3cf9cc352a6d61c3fee2a10 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Mon, 15 Jan 2024 19:41:50 +0800 Subject: [PATCH] perf: Modify i18n for settings module. (#12543) Co-authored-by: Bai --- apps/locale/core/ja/LC_MESSAGES/django.po | 12 ++++----- apps/locale/core/zh/LC_MESSAGES/django.po | 12 ++++----- apps/locale/lina/en.json | 31 ++++++++--------------- apps/settings/serializers/auth/base.py | 2 +- apps/settings/serializers/auth/oidc.py | 2 +- apps/settings/serializers/basic.py | 4 +-- apps/settings/serializers/feature.py | 4 +-- 7 files changed, 29 insertions(+), 38 deletions(-) diff --git a/apps/locale/core/ja/LC_MESSAGES/django.po b/apps/locale/core/ja/LC_MESSAGES/django.po index b566534c4..04e0a5b28 100644 --- a/apps/locale/core/ja/LC_MESSAGES/django.po +++ b/apps/locale/core/ja/LC_MESSAGES/django.po @@ -5019,7 +5019,7 @@ msgid "Passkey Auth" msgstr "Passkey 認証" #: settings/serializers/auth/base.py:26 -msgid "Forgot password url" +msgid "Forgot Password URL" msgstr "パスワードのURLを忘れた" #: settings/serializers/auth/base.py:29 @@ -5184,7 +5184,7 @@ msgid "OIDC" msgstr "OIDC" #: settings/serializers/auth/oidc.py:16 -msgid "Base site url" +msgid "Base site URL" msgstr "ベースサイトのアドレス" #: settings/serializers/auth/oidc.py:32 @@ -5430,7 +5430,7 @@ msgid "Enable WeCom Auth" msgstr "企業微信認証の有効化" #: settings/serializers/basic.py:11 -msgid "Site url" +msgid "Site URL" msgstr "サイトURL" #: settings/serializers/basic.py:13 @@ -5450,7 +5450,7 @@ msgid "User first login update profile done redirect to it" msgstr "ユーザーの最初のログイン更新プロファイルがリダイレクトされました" #: settings/serializers/basic.py:22 -msgid "Global organization name" +msgid "Global organization" msgstr "グローバル組織名" #: settings/serializers/basic.py:23 @@ -5526,7 +5526,7 @@ msgid "Subject" msgstr "件名" #: settings/serializers/feature.py:22 -msgid "More url" +msgid "More URL" msgstr "もっとURL" #: settings/serializers/feature.py:36 settings/serializers/feature.py:39 @@ -5569,7 +5569,7 @@ msgid "Enable Chat AI" msgstr "チャットAIを起動する" #: settings/serializers/feature.py:78 -msgid "Base Url" +msgid "Base URL" msgstr "基本的なUrl" #: settings/serializers/feature.py:81 templates/_header_bar.html:90 diff --git a/apps/locale/core/zh/LC_MESSAGES/django.po b/apps/locale/core/zh/LC_MESSAGES/django.po index 335b5d3de..f5f900e9e 100644 --- a/apps/locale/core/zh/LC_MESSAGES/django.po +++ b/apps/locale/core/zh/LC_MESSAGES/django.po @@ -4964,7 +4964,7 @@ msgid "Passkey Auth" msgstr "Passkey 认证" #: settings/serializers/auth/base.py:26 -msgid "Forgot password url" +msgid "Forgot Password URL" msgstr "忘记密码 URL" #: settings/serializers/auth/base.py:29 @@ -5129,7 +5129,7 @@ msgid "OIDC" msgstr "OIDC" #: settings/serializers/auth/oidc.py:16 -msgid "Base site url" +msgid "Base site URL" msgstr "JumpServer 地址" #: settings/serializers/auth/oidc.py:32 @@ -5372,7 +5372,7 @@ msgid "Enable WeCom Auth" msgstr "启用企业微信认证" #: settings/serializers/basic.py:11 -msgid "Site url" +msgid "Site URL" msgstr "当前站点 URL" #: settings/serializers/basic.py:13 @@ -5392,7 +5392,7 @@ msgid "User first login update profile done redirect to it" msgstr "用户第一次登录，修改profile后重定向到地址, 可以是 wiki 或 其他说明文档" #: settings/serializers/basic.py:22 -msgid "Global organization name" +msgid "Global organization" msgstr "全局组织名" #: settings/serializers/basic.py:23 @@ -5467,7 +5467,7 @@ msgid "Subject" msgstr "主题" #: settings/serializers/feature.py:22 -msgid "More url" +msgid "More URL" msgstr "更多信息 URL" #: settings/serializers/feature.py:36 settings/serializers/feature.py:39 @@ -5509,7 +5509,7 @@ msgid "Enable Chat AI" msgstr "启动聊天 AI" #: settings/serializers/feature.py:78 -msgid "Base Url" +msgid "Base URL" msgstr "基本地址" #: settings/serializers/feature.py:81 templates/_header_bar.html:90 diff --git a/apps/locale/lina/en.json b/apps/locale/lina/en.json index 41c50959f..8fc67c281 100644 --- a/apps/locale/lina/en.json +++ b/apps/locale/lina/en.json @@ -95,7 +95,6 @@ "AdminUserList": "Admin Users", "AdminUserListHelpMessage": "Admin users are asset (charged server) on the root, or have NOPASSWD: ALL sudo permissions users, JumpServer users of the system using the user to `push system user`, `get assets hardware information`, etc.\n", "AdminUserUpdate": "Admin user update", - "AdminUsersAmount": "Admin users amount", "Advanced": "Advanced", "AfterChange": "After the change", "AjaxError404": "404 ajax error", @@ -116,7 +115,6 @@ "ApiKeyList": "The API key is used to sign the request header. The header of each request is different. Please refer to the usage documentation", "ApiKeyWarning": "To reduce the risk of AccessKey exposure, Secret is provided only during creation and cannot be queried again later. Please keep it safe.", "App": "Application", - "AppAmount": "Application amount", "AppAuth": "App auth", "AppChangeAuthPlan": "App Change Auth Plan", "AppChangeAuthPlanCreate": "Create App change auth plan", @@ -126,7 +124,6 @@ "AppName": "App name", "AppOps": "Task center", "AppPath": "App path", - "AppPermsAmount": "App perms amount", "AppProvider": "App provider", "AppProviderDetail": "Provider Detail", "AppType": "App type", @@ -150,7 +147,6 @@ "ApplicationPermissionRules": "Application permission rules", "ApplicationPermissionUpdate": "Application permission update", "Applications": "Applications", - "ApplicationsAmount": "Applications amount", "ApplyAsset": "Apply asset", "ApplyFromCMDFilterRule": "Command filter rule", "ApplyFromSession": "Session", @@ -182,7 +178,7 @@ "AssetAddress": "IP/Host", "AssetAmount": "Asset", "AssetAndNode": "Assets and node", - "AssetBulkUpdateTips": "device、cloud、web，Batch update of domain is not supported", + "AssetBulkUpdateTips": "device、cloud、web, Batch update of domain is not supported", "AssetChangeAuthPlan": "Asset Change Auth Plan", "AssetChangeAuthPlanCreate": "Create Asset change auth plan", "AssetChangeAuthPlanUpdate": "Update Asset change auth plan", @@ -206,7 +202,7 @@ "AssetPermissionList": "Asset permission list", "AssetPermissionRules": "Asset permission rules", "AssetPermissionUpdate": "Asset permissions update", - "AssetPermsAmount": "Asset perms amount", + "AssetPermsAmount": "Permissions", "AssetProtocolHelpText": "Asset support protocol is limited by platform, click the Settings button to view the protocol settings. If you need to update, please update the platform", "AssetRatio": "Asset radio", "AssetResultDetail": "Asset result", @@ -214,7 +210,7 @@ "AssetUpdate": "Asset update", "AssetUserList": "Asset user", "Assets": "Assets", - "AssetsAmount": "Assets amount", + "AssetsAmount": "Assets", "AssetsTotal": "Asset total", "AssignedInfo": "Assigned Info", "AssignedMe": "Assigned me", @@ -229,7 +225,7 @@ "AttrValue": "Attribute Value", "Auditor": "Auditor", "Audits": "Audit", - "Auth": "Auth", + "Auth": "Authentications", "AuthCASAttrMap": "User Attribute Mapping", "AuthLdap": "Enable LDAP auth", "AuthLdapBindDn": "Bind DN", @@ -271,7 +267,7 @@ "BasePlatform": "Base platform", "BasePort": "listening port", "Basic": "Basic", - "BasicInfo": "Basic info", + "BasicInfo": "Basic information", "BasicSetting": "Basic setting", "BasicTools": "Basic tool", "BatchActivate": "Batch activate", @@ -336,7 +332,7 @@ "ChangeViewHelpText": "Click to change view", "Charset": "Charset", "Chat": "Chat", - "ChatAI": "Chat ai", + "ChatAI": "Chat AI", "ChatHello": "Hello! What help can I offer you?", "ChdirHelpText": "The default execution directory is the home directory of the executing user", "CheckAssetsAmount": "Check assets amount", @@ -736,7 +732,7 @@ "GrantedK8Ss": "Granted K8Ss", "GrantedRemoteApps": "Granted remote apps", "GreatEqualThan": "Greater than or equal to", - "GroupsAmount": "Groups amount", + "GroupsAmount": "Groups", "GroupsHelpMessage": "Please fill in user groups, separated by commas if there are multiple user groups(Please fill in the existing user groups)", "Guide": "Guide", "HandleTicket": "Handle Ticket", @@ -1524,7 +1520,7 @@ "SignaturesAndTemplates": "Signatures and Templates", "SiteMessage": "Site messages", "SiteMessageList": "Site message", - "SiteUrl": "Current SITE URL", + "SiteUrl": "Current Site URL", "Skip": "Ignore current asset", "Skipped": "Skipped", "Slack": "Slack", @@ -1608,17 +1604,12 @@ "SystemSetting": "System setting", "SystemTools": "Tools", "SystemUser": "System user", - "SystemUserAmount": "SystemUser amount", - "SystemUserCount": "System user count", - "SystemUserCreate": "System user create", - "SystemUserDetail": "System user detail", "SystemUserId": "SystemUser Id", "SystemUserList": "System Users", "SystemUserListHelpMessage": "System user is the account JumpServer used to log into the asset, such as using root `ssh root@host`, rather than the current user username（ssh admin@host)`;
Admin user is the account that already exists on an asset, and have privileged permissions, JumpServer using this create common system user, and gather hardware Etc;
Common user can pre-exist assets or created automatically by the admin user.", "SystemUserName": "System username", "SystemUserUpdate": "System user update", "SystemUsers": "System users", - "SystemUsersAmount": "System users amount", "SystemUsersNameGroup": "Systemuser name", "SystemUsersProtocolGroup": "Systemuser protocol", "SystemUsersUsernameGroup": "systemuser username", @@ -1738,7 +1729,7 @@ "UnselectedOrg": "Unselected org", "UnselectedUser": "Unselected user", "UpDownload": "Upload download", - "Update": "Update", + "Update": "Edit", "UpdateAccount": "Update account", "UpdateAccountMsg": "Please update system user account info", "UpdateAccountTemplate": "Update account template", @@ -1822,7 +1813,7 @@ "UsernameOfCreateUpdatePage": "The username of the user on the target host; If already existed, modify user password; If it doesn't exist, add the user and set the password.", "UsernamePlaceholder": "Please input username", "Users": "User", - "UsersAmount": "Users amount", + "UsersAmount": "Users", "UsersAndUserGroups": "Users and user groups", "UsersTotal": "Accounts total", "Valid": "Valid", @@ -1876,4 +1867,4 @@ "Workspace": "Workspace", "Yes": "Yes", "ZStack": "ZStack" -} \ No newline at end of file +} diff --git a/apps/settings/serializers/auth/base.py b/apps/settings/serializers/auth/base.py index fbc833124..b6358c197 100644 --- a/apps/settings/serializers/auth/base.py +++ b/apps/settings/serializers/auth/base.py @@ -23,7 +23,7 @@ class AuthSettingSerializer(serializers.Serializer): AUTH_PASSKEY = serializers.BooleanField(default=False, label=_("Passkey Auth")) FORGOT_PASSWORD_URL = serializers.CharField( required=False, allow_blank=True, max_length=1024, - label=_("Forgot password url") + label=_("Forgot Password URL") ) LOGIN_REDIRECT_MSG_ENABLED = serializers.BooleanField( required=False, label=_("Enable login redirect msg") diff --git a/apps/settings/serializers/auth/oidc.py b/apps/settings/serializers/auth/oidc.py index 0738de49a..ae0b69b2f 100644 --- a/apps/settings/serializers/auth/oidc.py +++ b/apps/settings/serializers/auth/oidc.py @@ -13,7 +13,7 @@ class CommonSettingSerializer(serializers.Serializer): # OpenID 公有配置参数 (version <= 1.5.8 或 version >= 1.5.8) BASE_SITE_URL = serializers.CharField( required=False, allow_null=True, allow_blank=True, - max_length=1024, label=_('Base site url') + max_length=1024, label=_('Base site URL') ) AUTH_OPENID_CLIENT_ID = serializers.CharField( required=False, max_length=1024, label=_('Client Id') diff --git a/apps/settings/serializers/basic.py b/apps/settings/serializers/basic.py index 4e253c602..1cdd96f23 100644 --- a/apps/settings/serializers/basic.py +++ b/apps/settings/serializers/basic.py @@ -8,7 +8,7 @@ class BasicSettingSerializer(serializers.Serializer): PREFIX_TITLE = _('Basic') SITE_URL = serializers.URLField( - required=True, label=_("Site url"), + required=True, label=_("Site URL"), help_text=_( 'External URL, email links or other system callbacks are used to access it, ' 'eg: http://dev.jumpserver.org:8080' @@ -19,7 +19,7 @@ class BasicSettingSerializer(serializers.Serializer): help_text=_('User first login update profile done redirect to it') ) GLOBAL_ORG_DISPLAY_NAME = serializers.CharField( - required=False, max_length=1024, allow_blank=True, allow_null=True, label=_("Global organization name"), + required=False, max_length=1024, allow_blank=True, allow_null=True, label=_("Global organization"), help_text=_('The name of global organization to display') ) HELP_DOCUMENT_URL = serializers.URLField( diff --git a/apps/settings/serializers/feature.py b/apps/settings/serializers/feature.py index a1a734d54..2fb163cae 100644 --- a/apps/settings/serializers/feature.py +++ b/apps/settings/serializers/feature.py @@ -19,7 +19,7 @@ class AnnouncementSerializer(serializers.Serializer): CONTENT = serializers.CharField(label=_("Content")) LINK = serializers.URLField( required=False, allow_null=True, allow_blank=True, - label=_("More url"), default='', + label=_("More URL"), default='', ) def to_representation(self, instance): @@ -75,7 +75,7 @@ class ChatAISettingSerializer(serializers.Serializer): required=False, label=_('Enable Chat AI') ) GPT_BASE_URL = serializers.CharField( - max_length=256, allow_blank=True, required=False, label=_('Base Url') + max_length=256, allow_blank=True, required=False, label=_('Base URL') ) GPT_API_KEY = EncryptedField( max_length=256, allow_blank=True, required=False, label=_('API Key'),