From 859bb91fc7a2c6aa8f65b24e65297fa2fe0c7083 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 26 Feb 2024 15:47:05 +0800 Subject: [PATCH] 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'), )