From f496f7d63529ab17249c5d9046627ef77aba5440 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 20 Apr 2023 13:51:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E4=BB=BB=E5=8A=A1=E7=9A=84=20i18n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../automations/gather_facts/database/mongodb/manifest.yml | 7 ++++++- .../automations/gather_facts/database/mysql/manifest.yml | 7 ++++++- .../automations/gather_facts/database/oracle/manifest.yml | 7 ++++++- .../gather_facts/database/postgresql/manifest.yml | 7 ++++++- .../automations/gather_facts/host/posix/manifest.yml | 7 ++++++- .../automations/gather_facts/host/windows/manifest.yml | 7 ++++++- apps/assets/automations/ping/database/mongodb/manifest.yml | 7 ++++++- apps/assets/automations/ping/database/mysql/manifest.yml | 7 ++++++- apps/assets/automations/ping/database/oracle/manifest.yml | 7 ++++++- .../automations/ping/database/postgresql/manifest.yml | 7 ++++++- .../automations/ping/database/sqlserver/manifest.yml | 7 ++++++- apps/assets/automations/ping/host/posix/manifest.yml | 2 +- apps/assets/automations/ping/host/windows/manifest.yml | 7 ++++++- 13 files changed, 73 insertions(+), 13 deletions(-) diff --git a/apps/assets/automations/gather_facts/database/mongodb/manifest.yml b/apps/assets/automations/gather_facts/database/mongodb/manifest.yml index 9b832e838..0f1a497b1 100644 --- a/apps/assets/automations/gather_facts/database/mongodb/manifest.yml +++ b/apps/assets/automations/gather_facts/database/mongodb/manifest.yml @@ -1,6 +1,11 @@ id: gather_facts_mongodb -name: Gather facts from MongoDB +name: "{{ 'Gather facts from MongoDB' | trans }}" category: database type: - mongodb method: gather_facts +i18n: + Gather facts from MongoDB: + zh: 从 MongoDB 获取信息 + en: Gather facts from MongoDB + ja: MongoDBから事実を取得する diff --git a/apps/assets/automations/gather_facts/database/mysql/manifest.yml b/apps/assets/automations/gather_facts/database/mysql/manifest.yml index 7149e96e9..d2f005859 100644 --- a/apps/assets/automations/gather_facts/database/mysql/manifest.yml +++ b/apps/assets/automations/gather_facts/database/mysql/manifest.yml @@ -1,7 +1,12 @@ id: gather_facts_mysql -name: Gather facts from MySQL +name: "{{ 'Gather facts from MySQL' | trans }}" category: database type: - mysql - mariadb method: gather_facts +i18n: + Gather facts from MySQL: + zh: 从 MySQL 获取信息 + en: Gather facts from MySQL + ja: MySQLから事実を取得する diff --git a/apps/assets/automations/gather_facts/database/oracle/manifest.yml b/apps/assets/automations/gather_facts/database/oracle/manifest.yml index d350579d6..e39522b75 100644 --- a/apps/assets/automations/gather_facts/database/oracle/manifest.yml +++ b/apps/assets/automations/gather_facts/database/oracle/manifest.yml @@ -1,6 +1,11 @@ id: gather_facts_oracle -name: Gather facts from Oracle +name: "{{ 'Gather facts from Oracle' | trans }}" category: database type: - oracle method: gather_facts +i18n: + Gather facts from Oracle: + zh: 从 Oracle 获取信息 + en: Gather facts from Oracle + ja: Oracleから事実を取得する diff --git a/apps/assets/automations/gather_facts/database/postgresql/manifest.yml b/apps/assets/automations/gather_facts/database/postgresql/manifest.yml index 19bf255de..288298d96 100644 --- a/apps/assets/automations/gather_facts/database/postgresql/manifest.yml +++ b/apps/assets/automations/gather_facts/database/postgresql/manifest.yml @@ -1,6 +1,11 @@ id: gather_facts_postgresql -name: Gather facts for PostgreSQL +name: "{{ 'Gather facts for PostgreSQL' | trans }}" category: database type: - postgresql method: gather_facts +i18n: + Gather facts for PostgreSQL: + zh: 从 PostgreSQL 获取信息 + en: Gather facts for PostgreSQL + ja: PostgreSQLから事実を取得する diff --git a/apps/assets/automations/gather_facts/host/posix/manifest.yml b/apps/assets/automations/gather_facts/host/posix/manifest.yml index b59b701aa..78eb1d897 100644 --- a/apps/assets/automations/gather_facts/host/posix/manifest.yml +++ b/apps/assets/automations/gather_facts/host/posix/manifest.yml @@ -1,7 +1,12 @@ id: gather_facts_posix -name: Gather posix facts +name: "{{ 'Gather posix facts' | trans }}" category: host type: - linux - unix method: gather_facts +i18n: + Gather posix facts: + zh: 从 Posix 主机获取信息 + en: Gather posix facts + ja: Posixから事実を取得する diff --git a/apps/assets/automations/gather_facts/host/windows/manifest.yml b/apps/assets/automations/gather_facts/host/windows/manifest.yml index 929a6626f..af7c50f68 100644 --- a/apps/assets/automations/gather_facts/host/windows/manifest.yml +++ b/apps/assets/automations/gather_facts/host/windows/manifest.yml @@ -1,7 +1,12 @@ id: gather_facts_windows -name: Gather facts windows +name: "{{ 'Gather facts windows' | trans }}" version: 1 method: gather_facts category: host type: - windows +i18n: + Gather facts windows: + zh: 从 Windows 获取信息 + en: Gather facts windows + ja: Windowsから事実を取得する diff --git a/apps/assets/automations/ping/database/mongodb/manifest.yml b/apps/assets/automations/ping/database/mongodb/manifest.yml index 45b90eb72..bdc0d73db 100644 --- a/apps/assets/automations/ping/database/mongodb/manifest.yml +++ b/apps/assets/automations/ping/database/mongodb/manifest.yml @@ -1,6 +1,11 @@ id: mongodb_ping -name: Ping MongoDB +name: "{{ 'Ping MongoDB' | trans }}" category: database type: - mongodb method: ping +i18n: + Ping MongoDB: + zh: 测试 MongoDB 可连接性 + en: Ping MongoDB + ja: MongoDBにPingする diff --git a/apps/assets/automations/ping/database/mysql/manifest.yml b/apps/assets/automations/ping/database/mysql/manifest.yml index 044907c6a..0452a8293 100644 --- a/apps/assets/automations/ping/database/mysql/manifest.yml +++ b/apps/assets/automations/ping/database/mysql/manifest.yml @@ -1,7 +1,12 @@ id: mysql_ping -name: Ping MySQL +name: "{{ 'Ping MySQL' | trans }}" category: database type: - mysql - mariadb method: ping +i18n: + Ping MySQL: + zh: 测试 MySQL 可连接性 + en: Ping MySQL + ja: MySQLにPingする diff --git a/apps/assets/automations/ping/database/oracle/manifest.yml b/apps/assets/automations/ping/database/oracle/manifest.yml index 3912941c3..bc55805b3 100644 --- a/apps/assets/automations/ping/database/oracle/manifest.yml +++ b/apps/assets/automations/ping/database/oracle/manifest.yml @@ -1,6 +1,11 @@ id: oracle_ping -name: Ping Oracle +name: "{{ 'Ping Oracle' | trans }}" category: database type: - oracle method: ping +i18n: + Ping Oracle: + zh: 测试 Oracle 可连接性 + en: Ping Oracle + ja: OracleにPingする diff --git a/apps/assets/automations/ping/database/postgresql/manifest.yml b/apps/assets/automations/ping/database/postgresql/manifest.yml index 337b2b50d..f7d7c3602 100644 --- a/apps/assets/automations/ping/database/postgresql/manifest.yml +++ b/apps/assets/automations/ping/database/postgresql/manifest.yml @@ -1,6 +1,11 @@ id: ping_postgresql -name: Ping PostgreSQL +name: "{{ 'Ping PostgreSQL' | trans }}" category: database type: - postgresql method: ping +i18n: + Ping PostgreSQL: + zh: 测试 PostgreSQL 可连接性 + en: Ping PostgreSQL + ja: PostgreSQLにPingする diff --git a/apps/assets/automations/ping/database/sqlserver/manifest.yml b/apps/assets/automations/ping/database/sqlserver/manifest.yml index b5cd6bf88..fe11e7486 100644 --- a/apps/assets/automations/ping/database/sqlserver/manifest.yml +++ b/apps/assets/automations/ping/database/sqlserver/manifest.yml @@ -1,6 +1,11 @@ id: sqlserver_ping -name: Ping SQLServer +name: "{{ 'Ping SQLServer' | trans }}" category: database type: - sqlserver method: ping +i18n: + Ping SQLServer: + zh: 测试 SQLServer 可连接性 + en: Ping SQLServer + ja: SQLServerにPingする diff --git a/apps/assets/automations/ping/host/posix/manifest.yml b/apps/assets/automations/ping/host/posix/manifest.yml index 1e6143480..ebc1046db 100644 --- a/apps/assets/automations/ping/host/posix/manifest.yml +++ b/apps/assets/automations/ping/host/posix/manifest.yml @@ -8,6 +8,6 @@ method: ping i18n: Posix ping: - zh: Posix ping + zh: 测试 Posix 可连接性 en: Posix ping ja: Posix ピング diff --git a/apps/assets/automations/ping/host/windows/manifest.yml b/apps/assets/automations/ping/host/windows/manifest.yml index 6218e5978..6798c1198 100644 --- a/apps/assets/automations/ping/host/windows/manifest.yml +++ b/apps/assets/automations/ping/host/windows/manifest.yml @@ -1,7 +1,12 @@ id: win_ping -name: Windows ping +name: "{{ 'Windows ping' | trans }}" version: 1 method: ping category: host type: - windows +i18n: + Windows ping: + zh: 测试 Windows 可连接性 + en: Windows ping + ja: Windows ピング From be58539df8c107abbfb805530efcc16a8cad2fe6 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 20 Apr 2023 14:19:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E6=94=AF?= =?UTF-8?q?=E6=8C=81=20i18n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/utils/yml.py | 4 ++-- apps/rbac/const.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/common/utils/yml.py b/apps/common/utils/yml.py index 540f1a31f..ccc151c8c 100644 --- a/apps/common/utils/yml.py +++ b/apps/common/utils/yml.py @@ -1,12 +1,12 @@ import io import yaml -from django.utils.translation import get_language +from django.conf import settings from jinja2 import Environment def translate(i18n, key): - lang = get_language()[:2] + lang = settings.LANGUAGE_CODE[:2] lang_data = i18n.get(key, {}) return lang_data.get(lang, key) diff --git a/apps/rbac/const.py b/apps/rbac/const.py index 4ab48161c..786cb74cc 100644 --- a/apps/rbac/const.py +++ b/apps/rbac/const.py @@ -146,6 +146,8 @@ only_system_permissions = ( ('authentication', '*', '*', '*'), ('tickets', '*', '*', '*'), ('orgs', 'organization', 'view', 'rootorg'), + ('terminal', 'applet', '*', '*'), + ('terminal', 'applethost', '*', '*'), ) only_org_permissions = ( From b52f18aea6c6acc780372309f93400eafcd6217b Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 20 Apr 2023 14:39:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20i18n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/utils/yml.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/utils/yml.py b/apps/common/utils/yml.py index ccc151c8c..6db03ea63 100644 --- a/apps/common/utils/yml.py +++ b/apps/common/utils/yml.py @@ -5,7 +5,7 @@ from django.conf import settings from jinja2 import Environment -def translate(i18n, key): +def translate(key, i18n): lang = settings.LANGUAGE_CODE[:2] lang_data = i18n.get(key, {}) return lang_data.get(lang, key) @@ -18,7 +18,7 @@ def yaml_load_with_i18n(stream): i18n = yaml_data.get('i18n', {}) env = Environment() - env.filters['trans'] = lambda key: translate(i18n, key) + env.filters['trans'] = lambda key: translate(key, i18n) template = env.from_string(ori_text) yaml_data = template.render() yaml_f = io.StringIO(yaml_data)