diff --git a/apps/assets/migrations/0084_auto_20220112_1959.py b/apps/assets/migrations/0084_auto_20220112_1959.py index 23183e71d..5385980e9 100644 --- a/apps/assets/migrations/0084_auto_20220112_1959.py +++ b/apps/assets/migrations/0084_auto_20220112_1959.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): fields=[ ('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')), ('name', models.CharField(max_length=128, verbose_name='Name')), - ('is_periodic', models.BooleanField(default=False)), + ('is_periodic', models.BooleanField(default=False, verbose_name='Periodic perform')), ('interval', models.IntegerField(blank=True, default=24, null=True, verbose_name='Cycle perform')), ('crontab', models.CharField(blank=True, max_length=128, null=True, verbose_name='Regularly perform')), ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')), diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index f61371d88..ce9f73624 100644 --- a/apps/locale/ja/LC_MESSAGES/django.po +++ b/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: 2022-11-07 18:16+0800\n" +"POT-Creation-Date: 2022-11-10 10:55+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,7 +33,7 @@ msgstr "Acls" #: terminal/models/storage.py:27 terminal/models/task.py:16 #: terminal/models/terminal.py:101 users/forms/profile.py:33 #: users/models/group.py:15 users/models/user.py:673 -#: xpack/plugins/cloud/models.py:28 +#: xpack/plugins/cloud/models.py:27 msgid "Name" msgstr "名前" @@ -66,7 +66,7 @@ msgstr "アクティブ" #: tickets/models/comment.py:32 tickets/models/ticket/general.py:288 #: users/models/group.py:16 users/models/user.py:712 #: xpack/plugins/change_auth_plan/models/base.py:44 -#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:116 +#: xpack/plugins/cloud/models.py:34 xpack/plugins/cloud/models.py:118 #: xpack/plugins/gathered_user/models.py:26 msgid "Comment" msgstr "コメント" @@ -138,7 +138,7 @@ msgstr "システムユーザー" #: terminal/notifications.py:93 #: xpack/plugins/change_auth_plan/models/asset.py:199 #: xpack/plugins/change_auth_plan/serializers/asset.py:181 -#: xpack/plugins/cloud/models.py:223 +#: xpack/plugins/cloud/models.py:225 msgid "Asset" msgstr "資産" @@ -226,7 +226,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "いずれのレビューアも組織 '{}' に属していません" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:23 +#: xpack/plugins/cloud/serializers/task.py:24 msgid "IP address invalid: `{}`" msgstr "IPアドレスが無効: '{}'" @@ -326,7 +326,7 @@ msgstr "タイプ" msgid "Domain" msgstr "ドメイン" -#: applications/models/application.py:230 xpack/plugins/cloud/models.py:33 +#: applications/models/application.py:230 xpack/plugins/cloud/models.py:32 #: xpack/plugins/cloud/serializers/account.py:64 msgid "Attrs" msgstr "ツールバーの" @@ -365,7 +365,7 @@ msgstr "タイプ表示" #: orgs/models.py:72 orgs/models.py:223 perms/models/base.py:92 #: users/models/group.py:18 users/models/user.py:937 #: xpack/plugins/change_auth_plan/models/base.py:45 -#: xpack/plugins/cloud/models.py:125 +#: xpack/plugins/cloud/models.py:127 msgid "Date created" msgstr "作成された日付" @@ -610,7 +610,7 @@ msgstr "ホスト名生" #: assets/models/asset.py:215 assets/serializers/account.py:16 #: assets/serializers/asset.py:65 perms/serializers/asset/user_permission.py:41 -#: xpack/plugins/cloud/models.py:107 xpack/plugins/cloud/serializers/task.py:43 +#: xpack/plugins/cloud/models.py:106 xpack/plugins/cloud/serializers/task.py:44 msgid "Protocols" msgstr "プロトコル" @@ -632,7 +632,7 @@ msgstr "アクティブです。" msgid "Admin user" msgstr "管理ユーザー" -#: assets/models/asset.py:225 +#: assets/models/asset.py:225 xpack/plugins/cloud/const.py:32 msgid "Public IP" msgstr "パブリックIP" @@ -651,7 +651,7 @@ msgstr "ラベル" #: orgs/models.py:225 perms/models/base.py:91 users/models/user.py:720 #: users/serializers/group.py:33 #: xpack/plugins/change_auth_plan/models/base.py:48 -#: xpack/plugins/cloud/models.py:122 xpack/plugins/gathered_user/models.py:30 +#: xpack/plugins/cloud/models.py:124 xpack/plugins/gathered_user/models.py:30 msgid "Created by" msgstr "によって作成された" @@ -763,7 +763,7 @@ msgstr "トリガーモード" #: xpack/plugins/change_auth_plan/models/base.py:201 #: xpack/plugins/change_auth_plan/serializers/app.py:66 #: xpack/plugins/change_auth_plan/serializers/asset.py:180 -#: xpack/plugins/cloud/models.py:179 +#: xpack/plugins/cloud/models.py:181 msgid "Reason" msgstr "理由" @@ -793,7 +793,7 @@ msgstr "OK" #: assets/models/base.py:32 audits/models.py:136 #: xpack/plugins/change_auth_plan/serializers/app.py:88 #: xpack/plugins/change_auth_plan/serializers/asset.py:199 -#: xpack/plugins/cloud/const.py:36 +#: xpack/plugins/cloud/const.py:41 msgid "Failed" msgstr "失敗しました" @@ -1013,7 +1013,7 @@ msgid "Parent key" msgstr "親キー" #: assets/models/node.py:566 assets/serializers/system_user.py:267 -#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:70 +#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers/task.py:72 msgid "Node" msgstr "ノード" @@ -1170,8 +1170,8 @@ msgstr "CPU情報" msgid "Actions" msgstr "アクション" -#: assets/serializers/backup.py:31 ops/mixin.py:106 ops/mixin.py:147 -#: settings/serializers/auth/ldap.py:66 +#: assets/serializers/backup.py:31 ops/mixin.py:26 ops/mixin.py:106 +#: ops/mixin.py:147 settings/serializers/auth/ldap.py:66 #: xpack/plugins/change_auth_plan/serializers/base.py:43 msgid "Periodic perform" msgstr "定期的なパフォーマンス" @@ -1581,8 +1581,8 @@ msgid "MFA" msgstr "MFA" #: audits/models.py:146 terminal/models/status.py:33 -#: tickets/models/ticket/general.py:281 xpack/plugins/cloud/models.py:175 -#: xpack/plugins/cloud/models.py:227 +#: tickets/models/ticket/general.py:281 xpack/plugins/cloud/models.py:177 +#: xpack/plugins/cloud/models.py:229 msgid "Status" msgstr "ステータス" @@ -1619,7 +1619,7 @@ msgid "Hosts display" msgstr "ホスト表示" #: audits/serializers.py:102 ops/models/command.py:27 -#: xpack/plugins/cloud/models.py:173 +#: xpack/plugins/cloud/models.py:175 msgid "Result" msgstr "結果" @@ -2135,7 +2135,7 @@ msgid "binding reminder" msgstr "バインディングリマインダー" #: authentication/serializers/connection_token.py:23 -#: xpack/plugins/cloud/models.py:34 +#: xpack/plugins/cloud/models.py:33 msgid "Validity" msgstr "有効性" @@ -5247,7 +5247,7 @@ msgstr "アクセスキー" msgid "Access key secret" msgstr "アクセスキーシークレット" -#: terminal/serializers/storage.py:65 xpack/plugins/cloud/models.py:220 +#: terminal/serializers/storage.py:65 xpack/plugins/cloud/models.py:222 msgid "Region" msgstr "リージョン" @@ -6516,30 +6516,34 @@ msgid "Fusion Compute" msgstr "" #: xpack/plugins/cloud/const.py:31 +msgid "Private IP" +msgstr "プライベートIP" + +#: xpack/plugins/cloud/const.py:36 msgid "Instance name" msgstr "インスタンス名" -#: xpack/plugins/cloud/const.py:32 +#: xpack/plugins/cloud/const.py:37 msgid "Instance name and Partial IP" msgstr "インスタンス名と部分IP" -#: xpack/plugins/cloud/const.py:37 +#: xpack/plugins/cloud/const.py:42 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/const.py:41 +#: xpack/plugins/cloud/const.py:46 msgid "Unsync" msgstr "同期していません" -#: xpack/plugins/cloud/const.py:42 +#: xpack/plugins/cloud/const.py:47 msgid "New Sync" msgstr "新しい同期" -#: xpack/plugins/cloud/const.py:43 +#: xpack/plugins/cloud/const.py:48 msgid "Synced" msgstr "同期済み" -#: xpack/plugins/cloud/const.py:44 +#: xpack/plugins/cloud/const.py:49 msgid "Released" msgstr "リリース済み" @@ -6547,75 +6551,79 @@ msgstr "リリース済み" msgid "Cloud center" msgstr "クラウドセンター" -#: xpack/plugins/cloud/models.py:30 +#: xpack/plugins/cloud/models.py:29 msgid "Provider" msgstr "プロバイダー" -#: xpack/plugins/cloud/models.py:39 +#: xpack/plugins/cloud/models.py:38 msgid "Cloud account" msgstr "クラウドアカウント" -#: xpack/plugins/cloud/models.py:41 +#: xpack/plugins/cloud/models.py:40 msgid "Test cloud account" msgstr "クラウドアカウントのテスト" -#: xpack/plugins/cloud/models.py:85 xpack/plugins/cloud/serializers/task.py:67 +#: xpack/plugins/cloud/models.py:84 xpack/plugins/cloud/serializers/task.py:69 msgid "Account" msgstr "アカウント" -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:38 +#: xpack/plugins/cloud/models.py:87 xpack/plugins/cloud/serializers/task.py:39 msgid "Regions" msgstr "リージョン" -#: xpack/plugins/cloud/models.py:91 +#: xpack/plugins/cloud/models.py:90 msgid "Hostname strategy" msgstr "ホスト名戦略" -#: xpack/plugins/cloud/models.py:100 xpack/plugins/cloud/serializers/task.py:68 +#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:70 msgid "Unix admin user" msgstr "Unix adminユーザー" -#: xpack/plugins/cloud/models.py:104 xpack/plugins/cloud/serializers/task.py:69 +#: xpack/plugins/cloud/models.py:103 xpack/plugins/cloud/serializers/task.py:71 msgid "Windows admin user" msgstr "Windows管理者" -#: xpack/plugins/cloud/models.py:110 xpack/plugins/cloud/serializers/task.py:46 +#: xpack/plugins/cloud/models.py:109 xpack/plugins/cloud/serializers/task.py:47 msgid "IP network segment group" msgstr "IPネットワークセグメントグループ" -#: xpack/plugins/cloud/models.py:113 xpack/plugins/cloud/serializers/task.py:72 +#: xpack/plugins/cloud/models.py:112 +msgid "Sync IP type" +msgstr "同期IPタイプ" + +#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/serializers/task.py:74 msgid "Always update" msgstr "常に更新" -#: xpack/plugins/cloud/models.py:119 +#: xpack/plugins/cloud/models.py:121 msgid "Date last sync" msgstr "最終同期日" -#: xpack/plugins/cloud/models.py:130 xpack/plugins/cloud/models.py:171 +#: xpack/plugins/cloud/models.py:132 xpack/plugins/cloud/models.py:173 msgid "Sync instance task" msgstr "インスタンスの同期タスク" -#: xpack/plugins/cloud/models.py:182 xpack/plugins/cloud/models.py:230 +#: xpack/plugins/cloud/models.py:184 xpack/plugins/cloud/models.py:232 msgid "Date sync" msgstr "日付の同期" -#: xpack/plugins/cloud/models.py:186 +#: xpack/plugins/cloud/models.py:188 msgid "Sync instance task execution" msgstr "インスタンスタスクの同期実行" -#: xpack/plugins/cloud/models.py:210 +#: xpack/plugins/cloud/models.py:212 msgid "Sync task" msgstr "同期タスク" -#: xpack/plugins/cloud/models.py:214 +#: xpack/plugins/cloud/models.py:216 msgid "Sync instance task history" msgstr "インスタンスタスク履歴の同期" -#: xpack/plugins/cloud/models.py:217 +#: xpack/plugins/cloud/models.py:219 msgid "Instance" msgstr "インスタンス" -#: xpack/plugins/cloud/models.py:234 +#: xpack/plugins/cloud/models.py:236 msgid "Sync instance detail" msgstr "同期インスタンスの詳細" @@ -6900,7 +6908,7 @@ msgstr "テストポート" msgid "Test timeout" msgstr "テストタイムアウト" -#: xpack/plugins/cloud/serializers/task.py:29 +#: xpack/plugins/cloud/serializers/task.py:30 msgid "" "Only instances matching the IP range will be synced.
If the instance " "contains multiple IP addresses, the first IP address that matches will be " @@ -6914,19 +6922,19 @@ msgstr "" "ドレスをランダムに一致させることを意味します。
形式はコンマ区切りの文字列" "です。例:192.168.1.0/24,10.1.1.1-10.1.1.20" -#: xpack/plugins/cloud/serializers/task.py:36 +#: xpack/plugins/cloud/serializers/task.py:37 msgid "History count" msgstr "実行回数" -#: xpack/plugins/cloud/serializers/task.py:37 +#: xpack/plugins/cloud/serializers/task.py:38 msgid "Instance count" msgstr "インスタンス数" -#: xpack/plugins/cloud/serializers/task.py:66 +#: xpack/plugins/cloud/serializers/task.py:68 msgid "Linux admin user" msgstr "Linux管理者" -#: xpack/plugins/cloud/serializers/task.py:71 +#: xpack/plugins/cloud/serializers/task.py:73 #: xpack/plugins/gathered_user/serializers.py:20 msgid "Periodic display" msgstr "定期的な表示" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 3f9a1e728..dc81821c4 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/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: 2022-11-07 18:16+0800\n" +"POT-Creation-Date: 2022-11-10 10:55+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -32,7 +32,7 @@ msgstr "访问控制" #: terminal/models/storage.py:27 terminal/models/task.py:16 #: terminal/models/terminal.py:101 users/forms/profile.py:33 #: users/models/group.py:15 users/models/user.py:673 -#: xpack/plugins/cloud/models.py:28 +#: xpack/plugins/cloud/models.py:27 msgid "Name" msgstr "名称" @@ -65,7 +65,7 @@ msgstr "激活中" #: tickets/models/comment.py:32 tickets/models/ticket/general.py:288 #: users/models/group.py:16 users/models/user.py:712 #: xpack/plugins/change_auth_plan/models/base.py:44 -#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:116 +#: xpack/plugins/cloud/models.py:34 xpack/plugins/cloud/models.py:118 #: xpack/plugins/gathered_user/models.py:26 msgid "Comment" msgstr "备注" @@ -137,7 +137,7 @@ msgstr "系统用户" #: terminal/notifications.py:93 #: xpack/plugins/change_auth_plan/models/asset.py:199 #: xpack/plugins/change_auth_plan/serializers/asset.py:181 -#: xpack/plugins/cloud/models.py:223 +#: xpack/plugins/cloud/models.py:225 msgid "Asset" msgstr "资产" @@ -222,7 +222,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "所有复核人都不属于组织 `{}`" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:23 +#: xpack/plugins/cloud/serializers/task.py:24 msgid "IP address invalid: `{}`" msgstr "IP 地址无效: `{}`" @@ -321,7 +321,7 @@ msgstr "类型" msgid "Domain" msgstr "网域" -#: applications/models/application.py:230 xpack/plugins/cloud/models.py:33 +#: applications/models/application.py:230 xpack/plugins/cloud/models.py:32 #: xpack/plugins/cloud/serializers/account.py:64 msgid "Attrs" msgstr "属性" @@ -360,7 +360,7 @@ msgstr "类型名称" #: orgs/models.py:72 orgs/models.py:223 perms/models/base.py:92 #: users/models/group.py:18 users/models/user.py:937 #: xpack/plugins/change_auth_plan/models/base.py:45 -#: xpack/plugins/cloud/models.py:125 +#: xpack/plugins/cloud/models.py:127 msgid "Date created" msgstr "创建日期" @@ -605,7 +605,7 @@ msgstr "主机名原始" #: assets/models/asset.py:215 assets/serializers/account.py:16 #: assets/serializers/asset.py:65 perms/serializers/asset/user_permission.py:41 -#: xpack/plugins/cloud/models.py:107 xpack/plugins/cloud/serializers/task.py:43 +#: xpack/plugins/cloud/models.py:106 xpack/plugins/cloud/serializers/task.py:44 msgid "Protocols" msgstr "协议组" @@ -627,7 +627,7 @@ msgstr "激活" msgid "Admin user" msgstr "特权用户" -#: assets/models/asset.py:225 +#: assets/models/asset.py:225 xpack/plugins/cloud/const.py:32 msgid "Public IP" msgstr "公网IP" @@ -646,7 +646,7 @@ msgstr "标签管理" #: orgs/models.py:225 perms/models/base.py:91 users/models/user.py:720 #: users/serializers/group.py:33 #: xpack/plugins/change_auth_plan/models/base.py:48 -#: xpack/plugins/cloud/models.py:122 xpack/plugins/gathered_user/models.py:30 +#: xpack/plugins/cloud/models.py:124 xpack/plugins/gathered_user/models.py:30 msgid "Created by" msgstr "创建者" @@ -758,7 +758,7 @@ msgstr "触发模式" #: xpack/plugins/change_auth_plan/models/base.py:201 #: xpack/plugins/change_auth_plan/serializers/app.py:66 #: xpack/plugins/change_auth_plan/serializers/asset.py:180 -#: xpack/plugins/cloud/models.py:179 +#: xpack/plugins/cloud/models.py:181 msgid "Reason" msgstr "原因" @@ -788,7 +788,7 @@ msgstr "成功" #: assets/models/base.py:32 audits/models.py:136 #: xpack/plugins/change_auth_plan/serializers/app.py:88 #: xpack/plugins/change_auth_plan/serializers/asset.py:199 -#: xpack/plugins/cloud/const.py:36 +#: xpack/plugins/cloud/const.py:41 msgid "Failed" msgstr "失败" @@ -1008,7 +1008,7 @@ msgid "Parent key" msgstr "ssh私钥" #: assets/models/node.py:566 assets/serializers/system_user.py:267 -#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:70 +#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers/task.py:72 msgid "Node" msgstr "节点" @@ -1162,8 +1162,8 @@ msgstr "CPU信息" msgid "Actions" msgstr "动作" -#: assets/serializers/backup.py:31 ops/mixin.py:106 ops/mixin.py:147 -#: settings/serializers/auth/ldap.py:66 +#: assets/serializers/backup.py:31 ops/mixin.py:26 ops/mixin.py:106 +#: ops/mixin.py:147 settings/serializers/auth/ldap.py:66 #: xpack/plugins/change_auth_plan/serializers/base.py:43 msgid "Periodic perform" msgstr "定时执行" @@ -1569,8 +1569,8 @@ msgid "MFA" msgstr "MFA" #: audits/models.py:146 terminal/models/status.py:33 -#: tickets/models/ticket/general.py:281 xpack/plugins/cloud/models.py:175 -#: xpack/plugins/cloud/models.py:227 +#: tickets/models/ticket/general.py:281 xpack/plugins/cloud/models.py:177 +#: xpack/plugins/cloud/models.py:229 msgid "Status" msgstr "状态" @@ -1607,7 +1607,7 @@ msgid "Hosts display" msgstr "主机名称" #: audits/serializers.py:102 ops/models/command.py:27 -#: xpack/plugins/cloud/models.py:173 +#: xpack/plugins/cloud/models.py:175 msgid "Result" msgstr "结果" @@ -2107,7 +2107,7 @@ msgid "binding reminder" msgstr "绑定提醒" #: authentication/serializers/connection_token.py:23 -#: xpack/plugins/cloud/models.py:34 +#: xpack/plugins/cloud/models.py:33 msgid "Validity" msgstr "有效" @@ -5163,7 +5163,7 @@ msgstr "访问密钥 ID(AK)" msgid "Access key secret" msgstr "访问密钥密文(SK)" -#: terminal/serializers/storage.py:65 xpack/plugins/cloud/models.py:220 +#: terminal/serializers/storage.py:65 xpack/plugins/cloud/models.py:222 msgid "Region" msgstr "地域" @@ -6415,30 +6415,34 @@ msgid "Fusion Compute" msgstr "" #: xpack/plugins/cloud/const.py:31 +msgid "Private IP" +msgstr "私有IP" + +#: xpack/plugins/cloud/const.py:36 msgid "Instance name" msgstr "实例名称" -#: xpack/plugins/cloud/const.py:32 +#: xpack/plugins/cloud/const.py:37 msgid "Instance name and Partial IP" msgstr "实例名称和部分IP" -#: xpack/plugins/cloud/const.py:37 +#: xpack/plugins/cloud/const.py:42 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/const.py:41 +#: xpack/plugins/cloud/const.py:46 msgid "Unsync" msgstr "未同步" -#: xpack/plugins/cloud/const.py:42 +#: xpack/plugins/cloud/const.py:47 msgid "New Sync" msgstr "新同步" -#: xpack/plugins/cloud/const.py:43 +#: xpack/plugins/cloud/const.py:48 msgid "Synced" msgstr "已同步" -#: xpack/plugins/cloud/const.py:44 +#: xpack/plugins/cloud/const.py:49 msgid "Released" msgstr "已释放" @@ -6446,75 +6450,79 @@ msgstr "已释放" msgid "Cloud center" msgstr "云管中心" -#: xpack/plugins/cloud/models.py:30 +#: xpack/plugins/cloud/models.py:29 msgid "Provider" msgstr "云服务商" -#: xpack/plugins/cloud/models.py:39 +#: xpack/plugins/cloud/models.py:38 msgid "Cloud account" msgstr "云账号" -#: xpack/plugins/cloud/models.py:41 +#: xpack/plugins/cloud/models.py:40 msgid "Test cloud account" msgstr "测试云账号" -#: xpack/plugins/cloud/models.py:85 xpack/plugins/cloud/serializers/task.py:67 +#: xpack/plugins/cloud/models.py:84 xpack/plugins/cloud/serializers/task.py:69 msgid "Account" msgstr "账号" -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:38 +#: xpack/plugins/cloud/models.py:87 xpack/plugins/cloud/serializers/task.py:39 msgid "Regions" msgstr "地域" -#: xpack/plugins/cloud/models.py:91 +#: xpack/plugins/cloud/models.py:90 msgid "Hostname strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:100 xpack/plugins/cloud/serializers/task.py:68 +#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:70 msgid "Unix admin user" msgstr "Unix 管理员" -#: xpack/plugins/cloud/models.py:104 xpack/plugins/cloud/serializers/task.py:69 +#: xpack/plugins/cloud/models.py:103 xpack/plugins/cloud/serializers/task.py:71 msgid "Windows admin user" msgstr "Windows 管理员" -#: xpack/plugins/cloud/models.py:110 xpack/plugins/cloud/serializers/task.py:46 +#: xpack/plugins/cloud/models.py:109 xpack/plugins/cloud/serializers/task.py:47 msgid "IP network segment group" msgstr "IP网段组" -#: xpack/plugins/cloud/models.py:113 xpack/plugins/cloud/serializers/task.py:72 +#: xpack/plugins/cloud/models.py:112 +msgid "Sync IP type" +msgstr "同步IP类型" + +#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/serializers/task.py:74 msgid "Always update" msgstr "总是更新" -#: xpack/plugins/cloud/models.py:119 +#: xpack/plugins/cloud/models.py:121 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:130 xpack/plugins/cloud/models.py:171 +#: xpack/plugins/cloud/models.py:132 xpack/plugins/cloud/models.py:173 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack/plugins/cloud/models.py:182 xpack/plugins/cloud/models.py:230 +#: xpack/plugins/cloud/models.py:184 xpack/plugins/cloud/models.py:232 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:186 +#: xpack/plugins/cloud/models.py:188 msgid "Sync instance task execution" msgstr "同步实例任务执行" -#: xpack/plugins/cloud/models.py:210 +#: xpack/plugins/cloud/models.py:212 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:214 +#: xpack/plugins/cloud/models.py:216 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:217 +#: xpack/plugins/cloud/models.py:219 msgid "Instance" msgstr "实例" -#: xpack/plugins/cloud/models.py:234 +#: xpack/plugins/cloud/models.py:236 msgid "Sync instance detail" msgstr "同步实例详情" @@ -6798,7 +6806,7 @@ msgstr "测试端口" msgid "Test timeout" msgstr "测试超时时间" -#: xpack/plugins/cloud/serializers/task.py:29 +#: xpack/plugins/cloud/serializers/task.py:30 msgid "" "Only instances matching the IP range will be synced.
If the instance " "contains multiple IP addresses, the first IP address that matches will be " @@ -6810,19 +6818,19 @@ msgstr "" "到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机匹配 " "IP 地址。
格式为以逗号分隔的字符串,例如:192.168.1.0/24,10.1.1.1-10.1.1.20" -#: xpack/plugins/cloud/serializers/task.py:36 +#: xpack/plugins/cloud/serializers/task.py:37 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers/task.py:37 +#: xpack/plugins/cloud/serializers/task.py:38 msgid "Instance count" msgstr "实例个数" -#: xpack/plugins/cloud/serializers/task.py:66 +#: xpack/plugins/cloud/serializers/task.py:68 msgid "Linux admin user" msgstr "Linux 管理员" -#: xpack/plugins/cloud/serializers/task.py:71 +#: xpack/plugins/cloud/serializers/task.py:73 #: xpack/plugins/gathered_user/serializers.py:20 msgid "Periodic display" msgstr "定时执行" diff --git a/apps/ops/migrations/0001_initial.py b/apps/ops/migrations/0001_initial.py index 13adf43a8..94643ffa0 100644 --- a/apps/ops/migrations/0001_initial.py +++ b/apps/ops/migrations/0001_initial.py @@ -59,7 +59,7 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')), ('interval', models.IntegerField(blank=True, help_text='Units: seconds', null=True, verbose_name='Interval')), ('crontab', models.CharField(blank=True, help_text='5 * * * *', max_length=128, null=True, verbose_name='Crontab')), - ('is_periodic', models.BooleanField(default=False)), + ('is_periodic', models.BooleanField(default=False, verbose_name='Periodic perform')), ('callback', models.CharField(blank=True, max_length=128, null=True, verbose_name='Callback')), ('is_deleted', models.BooleanField(default=False)), ('comment', models.TextField(blank=True, verbose_name='Comment')), diff --git a/apps/ops/mixin.py b/apps/ops/mixin.py index e64a763fc..da77bacae 100644 --- a/apps/ops/mixin.py +++ b/apps/ops/mixin.py @@ -23,7 +23,7 @@ class PeriodTaskModelMixin(models.Model): name = models.CharField( max_length=128, unique=False, verbose_name=_("Name") ) - is_periodic = models.BooleanField(default=False) + is_periodic = models.BooleanField(default=False, verbose_name=_("Periodic perform")) interval = models.IntegerField( default=24, null=True, blank=True, verbose_name=_("Cycle perform"),