Merge pull request #11247 from jumpserver/pr@dev@perf_change_edition

perf: 修改翻译

apps/locale/ja/LC_MESSAGES/django.mo

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50d8a03cc8991f92c9e649b4eb1685a9bc862671e013a11ba7683a1b7fcd0ae4
+oid sha256:7bc2e996c082d5f9348277e69cd70b7b9884dc416d9d83e075656a4d8b9bc141
-size 152899
+size 152939

apps/locale/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: 2023-08-10 11:06+0800\n"
+"POT-Creation-Date: 2023-08-10 17:27+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -523,7 +523,7 @@ msgstr "特権アカウント"
 #: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39
 #: assets/models/label.py:22
 #: authentication/serializers/connect_token_secret.py:114
-#: terminal/models/applet/applet.py:38
+#: terminal/models/applet/applet.py:39
 #: terminal/models/component/endpoint.py:105 users/serializers/user.py:169
 msgid "Is active"
 msgstr "アクティブです。"
@@ -636,7 +636,7 @@ msgstr "カテゴリ"
 #: assets/serializers/platform.py:127 audits/serializers.py:49
 #: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:130
 #: perms/serializers/user_permission.py:27 settings/serializers/vault.py:13
-#: terminal/models/applet/applet.py:37 terminal/models/component/storage.py:57
+#: terminal/models/applet/applet.py:38 terminal/models/component/storage.py:57
 #: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29
 #: terminal/serializers/session.py:21 terminal/serializers/storage.py:226
 #: terminal/serializers/storage.py:238 tickets/models/comment.py:26
@@ -761,8 +761,8 @@ msgstr ""
 #: assets/models/cmd_filter.py:40 assets/models/cmd_filter.py:88
 #: assets/models/group.py:20 common/db/models.py:36 ops/models/adhoc.py:26
 #: ops/models/job.py:138 ops/models/playbook.py:31 rbac/models/role.py:37
-#: settings/models.py:37 terminal/models/applet/applet.py:43
+#: settings/models.py:37 terminal/models/applet/applet.py:44
-#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:141
+#: terminal/models/applet/applet.py:284 terminal/models/applet/host.py:141
 #: terminal/models/component/endpoint.py:24
 #: terminal/models/component/endpoint.py:104
 #: terminal/models/session/session.py:46 tickets/models/comment.py:32
@@ -1386,7 +1386,7 @@ msgstr "ユーザーと同じユーザー名"
 
 #: assets/models/_user.py:52 authentication/models/connection_token.py:41
 #: authentication/serializers/connect_token_secret.py:111
-#: terminal/models/applet/applet.py:40 terminal/serializers/session.py:19
+#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:19
 #: terminal/serializers/session.py:42 terminal/serializers/storage.py:70
 msgid "Protocol"
 msgstr "プロトコル"
@@ -1530,7 +1530,7 @@ msgstr "アセットの自動化タスク"
 
 #: assets/models/automations/base.py:113 audits/models.py:199
 #: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:213
-#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:138
+#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:138
 #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18
 #: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283
 #: tickets/serializers/super_ticket.py:13
@@ -4062,7 +4062,7 @@ msgstr "デフォルト組織"
 msgid "SYSTEM"
 msgstr "システム組織"
 
-#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:39
+#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40
 msgid "Builtin"
 msgstr "ビルトイン"
 
@@ -4359,8 +4359,8 @@ msgstr "タスクセンター"
 msgid "My assets"
 msgstr "私の資産"
 
-#: rbac/tree.py:56 terminal/models/applet/applet.py:50
+#: rbac/tree.py:56 terminal/models/applet/applet.py:51
-#: terminal/models/applet/applet.py:279 terminal/models/applet/host.py:29
+#: terminal/models/applet/applet.py:280 terminal/models/applet/host.py:29
 #: terminal/serializers/applet.py:15
 msgid "Applet"
 msgstr "リモートアプリケーション"
@@ -5760,7 +5760,7 @@ msgstr "確認コードが送信されました"
 msgid "Home page"
 msgstr "ホームページ"
 
-#: templates/resource_download.html:18 templates/resource_download.html:32
+#: templates/resource_download.html:18 templates/resource_download.html:33
 msgid "Client"
 msgstr "クライアント"
 
@@ -5773,15 +5773,15 @@ msgstr ""
 "るために使用されており、現在はRDP SSHクライアントのみをサポートしています。"
 "「Telnetは将来的にサポートする"
 
-#: templates/resource_download.html:32
+#: templates/resource_download.html:33
 msgid "Microsoft"
 msgstr "マイクロソフト"
 
-#: templates/resource_download.html:32
+#: templates/resource_download.html:33
 msgid "Official"
 msgstr "公式"
 
-#: templates/resource_download.html:34
+#: templates/resource_download.html:35
 msgid ""
 "macOS needs to download the client to connect RDP asset, which comes with "
 "Windows"
@@ -5789,11 +5789,11 @@ msgstr ""
 "MacOSは、Windowsに付属のRDPアセットを接続するためにクライアントをダウンロード"
 "する必要があります"
 
-#: templates/resource_download.html:43
+#: templates/resource_download.html:44
 msgid "Windows Remote application publisher tools"
 msgstr "Windowsリモートアプリケーション発行者ツール"
 
-#: templates/resource_download.html:44
+#: templates/resource_download.html:45
 msgid ""
 "OpenSSH is a program used to connect remote applications in the Windows "
 "Remote Application Publisher"
@@ -5801,7 +5801,7 @@ msgstr ""
 "OpenSSHはリモートアプリケーションをWindowsリモートアプリケーションで接続する"
 "プログラムです"
 
-#: templates/resource_download.html:52
+#: templates/resource_download.html:53
 msgid "Offline video player"
 msgstr "オフラインビデオプレーヤー"
 
@@ -5984,7 +5984,7 @@ msgstr "ストレージが無効です"
 msgid "Community"
 msgstr "コミュニティ版"
 
-#: terminal/models/applet/applet.py:30 terminal/models/applet/applet.py:36
+#: terminal/models/applet/applet.py:30
 msgid "Enterprise"
 msgstr "エンタープライズ版"
 
@@ -5992,35 +5992,39 @@ msgstr "エンタープライズ版"
 msgid "Author"
 msgstr "著者"
 
-#: terminal/models/applet/applet.py:41
+#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:31
+msgid "Edition"
+msgstr "バージョン"
+
+#: terminal/models/applet/applet.py:42
 msgid "Can concurrent"
 msgstr "同時実行可能"
 
-#: terminal/models/applet/applet.py:42
+#: terminal/models/applet/applet.py:43
 msgid "Tags"
 msgstr "ラベル"
 
-#: terminal/models/applet/applet.py:46 terminal/serializers/storage.py:159
+#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:159
 msgid "Hosts"
 msgstr "ホスト"
 
-#: terminal/models/applet/applet.py:91
+#: terminal/models/applet/applet.py:92
 msgid "Applet pkg not valid, Missing file {}"
 msgstr "無効なアプレット パッケージ、ファイル {} がありません"
 
-#: terminal/models/applet/applet.py:110
+#: terminal/models/applet/applet.py:111
 msgid "Load platform.yml failed: {}"
 msgstr "platform.ymlのロードに失敗しました:{}"
 
-#: terminal/models/applet/applet.py:113
+#: terminal/models/applet/applet.py:114
 msgid "Only support custom platform"
 msgstr "カスタムプラットフォームのみをサポート"
 
-#: terminal/models/applet/applet.py:118
+#: terminal/models/applet/applet.py:119
 msgid "Missing type in platform.yml"
 msgstr "platform.ymlにタイプがありません"
 
-#: terminal/models/applet/applet.py:281 terminal/models/applet/host.py:35
+#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:35
 #: terminal/models/applet/host.py:136
 msgid "Hosting"
 msgstr "ホスト マシン"
@@ -8112,9 +8116,6 @@ msgstr "究極のエディション"
 msgid "Community edition"
 msgstr "コミュニティ版"
 
-#~ msgid "Edition"
-#~ msgstr "バージョン"
-
 #~ msgid "Strategy"
 #~ msgstr "戦略"
 

apps/locale/zh/LC_MESSAGES/django.mo

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ece6510d9392a16daca6d2729518ed6cf5df3a8c40c6e9e7881207df72a326b
+oid sha256:d1a6a042b4813d67922799caf3ac81ce3f1e831aed1a771dc9a16dab147a0692
-size 125537
+size 125568

apps/locale/zh/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 11:06+0800\n"
+"POT-Creation-Date: 2023-08-10 17:27+0800\n"
 "PO-Revision-Date: 2021-05-20 10:54+0800\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -522,7 +522,7 @@ msgstr "特权账号"
 #: assets/models/automations/base.py:21 assets/models/cmd_filter.py:39
 #: assets/models/label.py:22
 #: authentication/serializers/connect_token_secret.py:114
-#: terminal/models/applet/applet.py:38
+#: terminal/models/applet/applet.py:39
 #: terminal/models/component/endpoint.py:105 users/serializers/user.py:169
 msgid "Is active"
 msgstr "激活"
@@ -636,7 +636,7 @@ msgstr "类别"
 #: assets/serializers/platform.py:127 audits/serializers.py:49
 #: authentication/serializers/connect_token_secret.py:123 ops/models/job.py:130
 #: perms/serializers/user_permission.py:27 settings/serializers/vault.py:13
-#: terminal/models/applet/applet.py:37 terminal/models/component/storage.py:57
+#: terminal/models/applet/applet.py:38 terminal/models/component/storage.py:57
 #: terminal/models/component/storage.py:146 terminal/serializers/applet.py:29
 #: terminal/serializers/session.py:21 terminal/serializers/storage.py:226
 #: terminal/serializers/storage.py:238 tickets/models/comment.py:26
@@ -761,8 +761,8 @@ msgstr ""
 #: assets/models/cmd_filter.py:40 assets/models/cmd_filter.py:88
 #: assets/models/group.py:20 common/db/models.py:36 ops/models/adhoc.py:26
 #: ops/models/job.py:138 ops/models/playbook.py:31 rbac/models/role.py:37
-#: settings/models.py:37 terminal/models/applet/applet.py:43
+#: settings/models.py:37 terminal/models/applet/applet.py:44
-#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:141
+#: terminal/models/applet/applet.py:284 terminal/models/applet/host.py:141
 #: terminal/models/component/endpoint.py:24
 #: terminal/models/component/endpoint.py:104
 #: terminal/models/session/session.py:46 tickets/models/comment.py:32
@@ -1384,7 +1384,7 @@ msgstr "用户名与用户相同"
 
 #: assets/models/_user.py:52 authentication/models/connection_token.py:41
 #: authentication/serializers/connect_token_secret.py:111
-#: terminal/models/applet/applet.py:40 terminal/serializers/session.py:19
+#: terminal/models/applet/applet.py:41 terminal/serializers/session.py:19
 #: terminal/serializers/session.py:42 terminal/serializers/storage.py:70
 msgid "Protocol"
 msgstr "协议"
@@ -1528,7 +1528,7 @@ msgstr "资产自动化任务"
 
 #: assets/models/automations/base.py:113 audits/models.py:199
 #: audits/serializers.py:50 ops/models/base.py:49 ops/models/job.py:213
-#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:138
+#: terminal/models/applet/applet.py:283 terminal/models/applet/host.py:138
 #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18
 #: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283
 #: tickets/serializers/super_ticket.py:13
@@ -4013,7 +4013,7 @@ msgstr "默认组织"
 msgid "SYSTEM"
 msgstr "系统组织"
 
-#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:39
+#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40
 msgid "Builtin"
 msgstr "内置的"
 
@@ -4309,8 +4309,8 @@ msgstr "任务中心"
 msgid "My assets"
 msgstr "我的资产"
 
-#: rbac/tree.py:56 terminal/models/applet/applet.py:50
+#: rbac/tree.py:56 terminal/models/applet/applet.py:51
-#: terminal/models/applet/applet.py:279 terminal/models/applet/host.py:29
+#: terminal/models/applet/applet.py:280 terminal/models/applet/host.py:29
 #: terminal/serializers/applet.py:15
 msgid "Applet"
 msgstr "远程应用"
@@ -5676,7 +5676,7 @@ msgstr "验证码已发送"
 msgid "Home page"
 msgstr "首页"
 
-#: templates/resource_download.html:18 templates/resource_download.html:32
+#: templates/resource_download.html:18 templates/resource_download.html:33
 msgid "Client"
 msgstr "客户端"
 
@@ -5688,31 +5688,31 @@ msgstr ""
 "JumpServer 客户端，目前用来唤起 特定客户端程序 连接资产, 目前仅支持 RDP SSH "
 "客户端，Telnet 会在未来支持"
 
-#: templates/resource_download.html:32
+#: templates/resource_download.html:33
 msgid "Microsoft"
 msgstr "微软"
 
-#: templates/resource_download.html:32
+#: templates/resource_download.html:33
 msgid "Official"
 msgstr "官方"
 
-#: templates/resource_download.html:34
+#: templates/resource_download.html:35
 msgid ""
 "macOS needs to download the client to connect RDP asset, which comes with "
 "Windows"
 msgstr "macOS 需要下载客户端来连接 RDP 资产，Windows 系统默认安装了该程序"
 
-#: templates/resource_download.html:43
+#: templates/resource_download.html:44
 msgid "Windows Remote application publisher tools"
 msgstr "Windows 远程应用发布服务器工具"
 
-#: templates/resource_download.html:44
+#: templates/resource_download.html:45
 msgid ""
 "OpenSSH is a program used to connect remote applications in the Windows "
 "Remote Application Publisher"
 msgstr "OpenSSH 是在 windows 远程应用发布服务器中用来连接远程应用的程序"
 
-#: templates/resource_download.html:52
+#: templates/resource_download.html:53
 msgid "Offline video player"
 msgstr "离线录像播放器"
 
@@ -5887,7 +5887,7 @@ msgstr "存储无效"
 msgid "Community"
 msgstr "社区版"
 
-#: terminal/models/applet/applet.py:30 terminal/models/applet/applet.py:36
+#: terminal/models/applet/applet.py:30
 msgid "Enterprise"
 msgstr "企业版"
 
@@ -5895,35 +5895,39 @@ msgstr "企业版"
 msgid "Author"
 msgstr "作者"
 
-#: terminal/models/applet/applet.py:41
+#: terminal/models/applet/applet.py:37 terminal/serializers/applet.py:31
+msgid "Edition"
+msgstr "版本"
+
+#: terminal/models/applet/applet.py:42
 msgid "Can concurrent"
 msgstr "可以并发"
 
-#: terminal/models/applet/applet.py:42
+#: terminal/models/applet/applet.py:43
 msgid "Tags"
 msgstr "标签"
 
-#: terminal/models/applet/applet.py:46 terminal/serializers/storage.py:159
+#: terminal/models/applet/applet.py:47 terminal/serializers/storage.py:159
 msgid "Hosts"
 msgstr "主机"
 
-#: terminal/models/applet/applet.py:91
+#: terminal/models/applet/applet.py:92
 msgid "Applet pkg not valid, Missing file {}"
 msgstr "Applet pkg 无效，缺少文件 {}"
 
-#: terminal/models/applet/applet.py:110
+#: terminal/models/applet/applet.py:111
 msgid "Load platform.yml failed: {}"
 msgstr "加载 platform.yml 失败: {}"
 
-#: terminal/models/applet/applet.py:113
+#: terminal/models/applet/applet.py:114
 msgid "Only support custom platform"
 msgstr "只支持自定义平台"
 
-#: terminal/models/applet/applet.py:118
+#: terminal/models/applet/applet.py:119
 msgid "Missing type in platform.yml"
 msgstr "在 platform.yml 中缺少类型"
 
-#: terminal/models/applet/applet.py:281 terminal/models/applet/host.py:35
+#: terminal/models/applet/applet.py:282 terminal/models/applet/host.py:35
 #: terminal/models/applet/host.py:136
 msgid "Hosting"
 msgstr "宿主机"
@@ -7987,9 +7991,6 @@ msgstr "旗舰版"
 msgid "Community edition"
 msgstr "社区版"
 
-#~ msgid "Edition"
-#~ msgstr "版本"
-
 #~ msgid "Strategy"
 #~ msgstr "策略"
 

apps/terminal/serializers/applet.py

@@ -27,6 +27,10 @@ class AppletPublicationSerializer(serializers.ModelSerializer):
 class AppletSerializer(serializers.ModelSerializer):
     icon = serializers.ReadOnlyField(label=_("Icon"))
     type = LabeledChoiceField(choices=Applet.Type.choices, label=_("Type"))
+    edition = LabeledChoiceField(
+        choices=Applet.Edition.choices, label=_("Edition"), required=False,
+        default=Applet.Edition.community
+    )
 
     class Meta:
         model = Applet