diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 39667dc97..7196bfa06 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 928042d92..9c40a44b2 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-22 16:48+0800\n" +"POT-Creation-Date: 2019-03-22 17:12+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -33,6 +33,7 @@ msgstr "测试节点下资产是否可连接: {}" #: assets/templates/assets/asset_detail.html:194 #: assets/templates/assets/asset_detail.html:202 #: assets/templates/assets/system_user_asset.html:95 perms/models.py:31 +#: xpack/plugins/change_auth_plan/models.py:69 msgid "Nodes" msgstr "节点管理" @@ -72,6 +73,9 @@ msgstr "网域" #: perms/templates/perms/asset_permission_list.html:57 #: perms/templates/perms/asset_permission_list.html:78 #: perms/templates/perms/asset_permission_list.html:128 +#: xpack/plugins/change_auth_plan/forms.py:101 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:55 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:15 #: xpack/plugins/cloud/models.py:123 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:63 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:66 @@ -98,6 +102,8 @@ msgstr "如果有多个的互相隔离的网络，设置资产属于的网域， #: assets/forms/asset.py:92 assets/forms/asset.py:96 assets/forms/domain.py:17 #: assets/forms/label.py:15 #: perms/templates/perms/asset_permission_asset.html:88 +#: xpack/plugins/change_auth_plan/forms.py:92 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:84 msgid "Select assets" msgstr "选择资产" @@ -119,6 +125,12 @@ msgstr "选择资产" #: terminal/templates/terminal/command_list.html:73 #: terminal/templates/terminal/session_list.html:41 #: terminal/templates/terminal/session_list.html:72 +#: xpack/plugins/change_auth_plan/models.py:65 +#: xpack/plugins/change_auth_plan/models.py:401 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:40 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:54 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:13 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:14 #: xpack/plugins/cloud/models.py:187 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65 #: xpack/plugins/orgs/templates/orgs/org_list.html:16 @@ -167,6 +179,10 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC" #: users/templates/users/user_list.html:23 #: users/templates/users/user_profile.html:51 #: users/templates/users/user_pubkey_update.html:53 +#: xpack/plugins/change_auth_plan/forms.py:84 +#: xpack/plugins/change_auth_plan/models.py:58 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:61 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:12 #: xpack/plugins/cloud/models.py:49 xpack/plugins/cloud/models.py:119 #: xpack/plugins/cloud/templates/cloud/account_detail.html:52 #: xpack/plugins/cloud/templates/cloud/account_list.html:12 @@ -215,6 +231,8 @@ msgstr "密码或密钥密码" #: users/templates/users/user_profile_update.html:40 #: users/templates/users/user_pubkey_update.html:40 #: users/templates/users/user_update.html:20 +#: xpack/plugins/change_auth_plan/models.py:90 +#: xpack/plugins/change_auth_plan/models.py:252 msgid "Password" msgstr "密码" @@ -276,6 +294,7 @@ msgstr "使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig" #: perms/templates/perms/asset_permission_asset.html:55 settings/forms.py:133 #: users/templates/users/user_granted_asset.html:45 #: users/templates/users/user_group_granted_asset.html:45 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:51 msgid "IP" msgstr "IP" @@ -291,6 +310,7 @@ msgstr "IP" #: perms/templates/perms/asset_permission_list.html:77 settings/forms.py:132 #: users/templates/users/user_granted_asset.html:44 #: users/templates/users/user_group_granted_asset.html:44 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:50 msgid "Hostname" msgstr "主机名" @@ -409,6 +429,8 @@ msgstr "标签管理" #: ops/templates/ops/adhoc_detail.html:86 orgs/models.py:15 perms/models.py:36 #: perms/models.py:89 perms/templates/perms/asset_permission_detail.html:98 #: users/models/user.py:95 users/templates/users/user_detail.html:111 +#: xpack/plugins/change_auth_plan/models.py:103 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113 #: xpack/plugins/cloud/models.py:55 xpack/plugins/cloud/models.py:127 msgid "Created by" msgstr "创建者" @@ -424,6 +446,7 @@ msgstr "创建者" #: perms/templates/perms/asset_permission_detail.html:94 #: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:17 #: users/templates/users/user_group_detail.html:63 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:105 #: xpack/plugins/cloud/models.py:56 xpack/plugins/cloud/models.py:128 #: xpack/plugins/cloud/templates/cloud/account_detail.html:68 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:79 @@ -454,8 +477,11 @@ msgstr "创建日期" #: users/templates/users/user_detail.html:127 #: users/templates/users/user_group_detail.html:67 #: users/templates/users/user_group_list.html:14 -#: users/templates/users/user_profile.html:134 xpack/plugins/cloud/models.py:54 -#: xpack/plugins/cloud/models.py:125 +#: users/templates/users/user_profile.html:134 +#: xpack/plugins/change_auth_plan/models.py:99 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:117 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:19 +#: xpack/plugins/cloud/models.py:54 xpack/plugins/cloud/models.py:125 #: xpack/plugins/cloud/templates/cloud/account_detail.html:72 #: xpack/plugins/cloud/templates/cloud/account_list.html:15 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:71 @@ -503,11 +529,13 @@ msgstr "版本" msgid "AuthBook" msgstr "" -#: assets/models/base.py:29 +#: assets/models/base.py:29 xpack/plugins/change_auth_plan/models.py:94 +#: xpack/plugins/change_auth_plan/models.py:259 msgid "SSH private key" msgstr "ssh密钥" -#: assets/models/base.py:30 +#: assets/models/base.py:30 xpack/plugins/change_auth_plan/models.py:97 +#: xpack/plugins/change_auth_plan/models.py:255 msgid "SSH public key" msgstr "ssh公钥" @@ -647,6 +675,9 @@ msgstr "每行一个命令" #: terminal/templates/terminal/terminal_list.html:36 #: users/templates/users/user_group_list.html:15 #: users/templates/users/user_list.html:29 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:60 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:18 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:20 #: xpack/plugins/cloud/templates/cloud/account_list.html:16 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:18 #: xpack/plugins/orgs/templates/orgs/org_list.html:23 @@ -926,6 +957,7 @@ msgid "Update asset user auth" msgstr "更新资产用户认证信息" #: assets/templates/assets/_asset_user_auth_modal.html:23 +#: xpack/plugins/change_auth_plan/forms.py:88 msgid "Please input password" msgstr "请输入密码" @@ -946,6 +978,7 @@ msgstr "如果使用了nat端口映射，请设置为ssh真实监听的端口" #: assets/templates/assets/asset_update.html:21 #: assets/templates/assets/gateway_create_update.html:37 #: perms/templates/perms/asset_permission_create_update.html:38 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:37 msgid "Basic" msgstr "基本" @@ -967,6 +1000,7 @@ msgstr "自动生成密钥" #: assets/templates/assets/gateway_create_update.html:53 #: perms/templates/perms/asset_permission_create_update.html:50 #: terminal/templates/terminal/terminal_update.html:40 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:61 msgid "Other" msgstr "其它" @@ -997,6 +1031,7 @@ msgstr "其它" #: users/templates/users/user_profile_update.html:63 #: users/templates/users/user_pubkey_update.html:70 #: users/templates/users/user_pubkey_update.html:76 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:65 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:33 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:35 #: xpack/plugins/interface/templates/interface/interface.html:88 @@ -1033,6 +1068,7 @@ msgstr "重置" #: users/templates/users/user_password_update.html:72 #: users/templates/users/user_profile_update.html:64 #: users/templates/users/user_pubkey_update.html:77 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:66 #: xpack/plugins/interface/templates/interface/interface.html:89 msgid "Submit" msgstr "提交" @@ -1062,6 +1098,7 @@ msgstr "关闭" #: perms/templates/perms/asset_permission_asset.html:18 #: perms/templates/perms/asset_permission_detail.html:18 #: perms/templates/perms/asset_permission_user.html:18 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:106 msgid "Detail" msgstr "详情" @@ -1072,6 +1109,7 @@ msgstr "资产列表" #: assets/templates/assets/admin_user_assets.html:29 #: perms/templates/perms/asset_permission_asset.html:35 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:31 msgid "Asset list of " msgstr "资产列表" @@ -1146,6 +1184,8 @@ msgstr "更新失败" #: users/templates/users/user_profile.html:177 #: users/templates/users/user_profile.html:187 #: users/templates/users/user_profile.html:196 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:29 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:54 #: xpack/plugins/cloud/templates/cloud/account_detail.html:25 #: xpack/plugins/cloud/templates/cloud/account_list.html:38 #: xpack/plugins/orgs/templates/orgs/org_detail.html:25 @@ -1178,6 +1218,8 @@ msgstr "更新" #: users/templates/users/user_group_list.html:45 #: users/templates/users/user_list.html:84 #: users/templates/users/user_list.html:88 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:33 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:56 #: xpack/plugins/cloud/templates/cloud/account_detail.html:29 #: xpack/plugins/cloud/templates/cloud/account_list.html:40 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:32 @@ -1193,6 +1235,8 @@ msgstr "替换资产的管理员" #: assets/templates/assets/admin_user_detail.html:91 #: perms/templates/perms/asset_permission_asset.html:116 +#: xpack/plugins/change_auth_plan/forms.py:96 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:112 msgid "Select nodes" msgstr "选择节点" @@ -1259,6 +1303,7 @@ msgstr "资产用户" #: assets/templates/assets/asset_asset_user_list.html:51 #: assets/templates/assets/cmd_filter_detail.html:73 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:109 msgid "Date updated" msgstr "更新日期" @@ -1267,6 +1312,7 @@ msgstr "更新日期" #: terminal/templates/terminal/session_detail.html:81 #: users/templates/users/user_detail.html:138 #: users/templates/users/user_profile.html:146 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:128 #: xpack/plugins/license/templates/license/license_detail.html:93 msgid "Quick modify" msgstr "快速修改" @@ -1801,7 +1847,9 @@ msgstr "文件名" #: audits/templates/audits/ftp_log_list.html:76 #: ops/templates/ops/command_execution_list.html:65 #: ops/templates/ops/task_list.html:31 -#: users/templates/users/user_detail.html:458 xpack/plugins/cloud/api.py:62 +#: users/templates/users/user_detail.html:458 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:14 +#: xpack/plugins/cloud/api.py:62 msgid "Success" msgstr "成功" @@ -1879,6 +1927,8 @@ msgid "MFA" msgstr "MFA" #: audits/models.py:100 audits/templates/audits/login_log_list.html:57 +#: xpack/plugins/change_auth_plan/models.py:405 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:15 #: xpack/plugins/cloud/models.py:172 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:69 msgid "Reason" @@ -1902,6 +1952,10 @@ msgstr "登录日期" #: ops/templates/ops/task_history.html:58 perms/models.py:34 #: perms/templates/perms/asset_permission_detail.html:86 terminal/models.py:165 #: terminal/templates/terminal/session_list.html:78 +#: xpack/plugins/change_auth_plan/models.py:238 +#: xpack/plugins/change_auth_plan/models.py:408 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:59 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:17 msgid "Date start" msgstr "开始日期" @@ -2229,6 +2283,10 @@ msgstr "完成时间" #: ops/models/adhoc.py:326 ops/templates/ops/adhoc_history.html:57 #: ops/templates/ops/task_history.html:63 ops/templates/ops/task_list.html:33 +#: xpack/plugins/change_auth_plan/models.py:241 +#: xpack/plugins/change_auth_plan/models.py:411 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:58 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:16 msgid "Time" msgstr "时间" @@ -2252,7 +2310,9 @@ msgstr "结果" msgid "Adhoc result summary" msgstr "汇总" -#: ops/models/command.py:22 xpack/plugins/cloud/models.py:170 +#: ops/models/command.py:22 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:56 +#: xpack/plugins/cloud/models.py:170 msgid "Result" msgstr "结果" @@ -2286,6 +2346,7 @@ msgid "Run as" msgstr "运行用户" #: ops/templates/ops/adhoc_detail.html:94 ops/templates/ops/task_list.html:28 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:18 msgid "Run times" msgstr "执行次数" @@ -2444,6 +2505,8 @@ msgid "Versions" msgstr "版本" #: ops/templates/ops/task_list.html:63 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:137 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:52 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:52 msgid "Run" msgstr "执行" @@ -2522,6 +2585,9 @@ msgstr "用户或用户组" #: perms/templates/perms/asset_permission_asset.html:27 #: perms/templates/perms/asset_permission_detail.html:27 #: perms/templates/perms/asset_permission_user.html:27 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:20 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:23 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:20 msgid "Assets and node" msgstr "资产或节点" @@ -2536,6 +2602,7 @@ msgstr "添加资产" #: settings/templates/settings/terminal_setting.html:95 #: settings/templates/settings/terminal_setting.html:117 #: users/templates/users/user_group_detail.html:95 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:93 #: xpack/plugins/orgs/templates/orgs/org_detail.html:93 #: xpack/plugins/orgs/templates/orgs/org_detail.html:130 msgid "Add" @@ -2547,6 +2614,7 @@ msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:125 #: users/templates/users/user_detail.html:230 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:121 msgid "Join" msgstr "加入" @@ -3090,20 +3158,22 @@ msgid "Have user but attr mapping error" msgstr "有用户但attr映射错误" #: settings/utils.py:60 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:86 msgid "No" msgstr "否" #: settings/utils.py:69 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:84 msgid "Yes" msgstr "是" -#: settings/utils.py:134 +#: settings/utils.py:137 msgid "" "Import {} users successfully; import {} users failed, the database already " "exists with the same name" msgstr "导入 {} 个用户成功; 导入 {} 这些用户失败，数据库已经存在同名的用户" -#: settings/utils.py:139 +#: settings/utils.py:142 msgid "" "Import {} users successfully; import {} users failed, the database already " "exists with the same name; import {}users failed, Because’TypeError' object " @@ -3112,11 +3182,11 @@ msgstr "" "导入 {} 个用户成功; 导入 {} 这些用户失败，数据库已经存在同名的用户; 导入 {} " "这些用户失败，因为对象没有属性'keys'" -#: settings/utils.py:145 +#: settings/utils.py:148 msgid "Import {} users successfully" msgstr "导入 {} 个用户成功" -#: settings/utils.py:148 +#: settings/utils.py:151 msgid "" "Import {} users successfully;import {} users failed, Because’TypeError' " "object has no attribute 'keys'" @@ -4666,6 +4736,193 @@ msgstr "MFA 解绑成功" msgid "MFA disable success, return login page" msgstr "MFA 解绑成功，返回登录页面" +#: xpack/plugins/change_auth_plan/forms.py:20 +msgid "Password length" +msgstr "密码长度" + +#: xpack/plugins/change_auth_plan/forms.py:40 +msgid "* Please enter custom password" +msgstr "* 请输入自定义密码" + +#: xpack/plugins/change_auth_plan/forms.py:50 +msgid "* Please enter a valid crontab expression" +msgstr "* 请输入有效的 crontab 表达式" + +#: xpack/plugins/change_auth_plan/forms.py:86 +#: xpack/plugins/change_auth_plan/models.py:60 +#: xpack/plugins/change_auth_plan/models.py:397 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:65 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:53 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:12 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:13 +msgid "Asset username" +msgstr "资产用户名" + +#: xpack/plugins/change_auth_plan/forms.py:102 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:54 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:81 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:17 +msgid "Periodic perform" +msgstr "定时执行" + +#: xpack/plugins/change_auth_plan/forms.py:106 +msgid "Tips: (Units: hour)" +msgstr "提示：（单位： 时）" + +#: xpack/plugins/change_auth_plan/forms.py:107 +msgid "" +"eg: Every Sunday 03:05 run (5 3 * * 0)
Tips: Using 5 digits linux " +"crontab expressions (Online tools)
Note: If both Regularly perform and " +"Cycle perform are set, give priority to Regularly perform" +msgstr "" +"eg：每周日 03:05 执行（5 3 * * 0）
提示： 使用5位 Linux crontab 表达式" +"（在线工具）
注" +"意： 如果同时设置了定期执行和周期执行，优先使用定期执行" + +#: xpack/plugins/change_auth_plan/meta.py:9 +#: xpack/plugins/change_auth_plan/models.py:110 +#: xpack/plugins/change_auth_plan/models.py:245 +#: xpack/plugins/change_auth_plan/views.py:31 +#: xpack/plugins/change_auth_plan/views.py:47 +#: xpack/plugins/change_auth_plan/views.py:68 +#: xpack/plugins/change_auth_plan/views.py:82 +#: xpack/plugins/change_auth_plan/views.py:109 +#: xpack/plugins/change_auth_plan/views.py:125 +#: xpack/plugins/change_auth_plan/views.py:139 +msgid "Change auth plan" +msgstr "改密计划" + +#: xpack/plugins/change_auth_plan/models.py:52 +msgid "Custom password" +msgstr "自定义密码" + +#: xpack/plugins/change_auth_plan/models.py:53 +msgid "All assets use the same random password" +msgstr "所有资产使用相同的随机密码" + +#: xpack/plugins/change_auth_plan/models.py:54 +msgid "All assets use different random password" +msgstr "所有资产使用不同的随机密码" + +#: xpack/plugins/change_auth_plan/models.py:73 +#: xpack/plugins/change_auth_plan/models.py:141 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:100 +msgid "Cycle perform" +msgstr "周期执行" + +#: xpack/plugins/change_auth_plan/models.py:78 +#: xpack/plugins/change_auth_plan/models.py:139 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:92 +msgid "Regularly perform" +msgstr "定期执行" + +#: xpack/plugins/change_auth_plan/models.py:83 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:45 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:69 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:57 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:16 +msgid "Password strategy" +msgstr "密码策略" + +#: xpack/plugins/change_auth_plan/models.py:87 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:74 +msgid "Password rules" +msgstr "密码规则" + +#: xpack/plugins/change_auth_plan/models.py:249 +msgid "Change auth plan snapshot" +msgstr "改密计划快照" + +#: xpack/plugins/change_auth_plan/models.py:264 +#: xpack/plugins/change_auth_plan/models.py:415 +msgid "Change auth plan execution" +msgstr "改密计划执行" + +#: xpack/plugins/change_auth_plan/models.py:424 +msgid "Change auth plan execution subtask" +msgstr "改密计划执行子任务" + +#: xpack/plugins/change_auth_plan/models.py:442 +msgid "Authentication failed" +msgstr "认证失败" + +#: xpack/plugins/change_auth_plan/models.py:444 +msgid "Connection timeout" +msgstr "连接超时" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:17 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:20 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:17 +#: xpack/plugins/change_auth_plan/views.py:83 +msgid "Plan detail" +msgstr "计划详情" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:23 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:26 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:23 +#: xpack/plugins/change_auth_plan/views.py:126 +msgid "Plan execution list" +msgstr "执行列表" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:76 +msgid "Add asset to this plan" +msgstr "添加资产" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:104 +msgid "Add node to this plan" +msgstr "添加节点" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:76 +msgid "Length" +msgstr "长度" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:134 +msgid "Execute plan" +msgstr "执行计划" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:179 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:101 +msgid "Execute failed" +msgstr "执行失败" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:31 +msgid "Execution list of plan" +msgstr "执行列表" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:104 +msgid "Log" +msgstr "日志" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:61 +msgid "Retry" +msgstr "重试" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:96 +msgid "Run failed" +msgstr "执行失败" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:5 +#: xpack/plugins/change_auth_plan/views.py:48 +msgid "Create plan" +msgstr "创建计划" + +#: xpack/plugins/change_auth_plan/views.py:32 +msgid "Plan list" +msgstr "计划列表" + +#: xpack/plugins/change_auth_plan/views.py:69 +msgid "Update plan" +msgstr "更新计划" + +#: xpack/plugins/change_auth_plan/views.py:110 +msgid "plan asset list" +msgstr "计划资产列表" + +#: xpack/plugins/change_auth_plan/views.py:140 +msgid "Plan execution task list" +msgstr "执行任务列表" + #: xpack/plugins/cloud/api.py:61 xpack/plugins/cloud/providers/base.py:84 msgid "Account unavailable" msgstr "账户无效" @@ -4702,7 +4959,7 @@ msgstr "选择管理员" #: xpack/plugins/cloud/views.py:41 xpack/plugins/cloud/views.py:57 #: xpack/plugins/cloud/views.py:71 xpack/plugins/cloud/views.py:84 #: xpack/plugins/cloud/views.py:100 xpack/plugins/cloud/views.py:121 -#: xpack/plugins/cloud/views.py:136 xpack/plugins/cloud/views.py:179 +#: xpack/plugins/cloud/views.py:136 xpack/plugins/cloud/views.py:187 msgid "Cloud center" msgstr "云管中心" @@ -4833,7 +5090,7 @@ msgstr "同步历史列表" #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:28 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:31 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:29 -#: xpack/plugins/cloud/views.py:180 +#: xpack/plugins/cloud/views.py:188 msgid "Sync instance list" msgstr "同步实例列表" @@ -4942,7 +5199,7 @@ msgstr "界面设置" msgid "Interface" msgstr "界面" -#: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:95 +#: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:94 #: xpack/plugins/license/templates/license/license_detail.html:50 #: xpack/plugins/license/views.py:31 msgid "License" @@ -5073,121 +5330,6 @@ msgstr "创建组织" msgid "Update org" msgstr "更新组织" -#~ msgid "Password length" -#~ msgstr "密码长度" - -#~ msgid "* Please enter custom password" -#~ msgstr "* 请输入自定义密码" - -#~ msgid "* Please enter a valid crontab expression" -#~ msgstr "* 请输入有效的 crontab 表达式" - -#~ msgid "Asset username" -#~ msgstr "资产用户名" - -#~ msgid "Periodic perform" -#~ msgstr "定时执行" - -#~ msgid "Tips: (Units: hour)" -#~ msgstr "提示：（单位： 时）" - -#~ msgid "" -#~ "eg: Every Sunday 03:05 run (5 3 * * 0)
Tips: Using 5 digits linux " -#~ "crontab expressions (Online tools)
Note: If both Regularly perform and " -#~ "Cycle perform are set, give priority to Regularly perform" -#~ msgstr "" -#~ "eg：每周日 03:05 执行（5 3 * * 0）
提示： 使用5位 Linux crontab 表达" -#~ "式（在线工具）
" -#~ "注意： 如果同时设置了定期执行和周期执行，优先使用定期执行" - -#~ msgid "Change auth plan" -#~ msgstr "改密计划" - -#~ msgid "Custom password" -#~ msgstr "自定义密码" - -#~ msgid "All assets use the same random password" -#~ msgstr "所有资产使用相同的随机密码" - -#~ msgid "All assets use different random password" -#~ msgstr "所有资产使用不同的随机密码" - -#~ msgid "Cycle perform" -#~ msgstr "周期执行" - -#~ msgid "Regularly perform" -#~ msgstr "定期执行" - -#~ msgid "Password strategy" -#~ msgstr "密码策略" - -#~ msgid "Password rules" -#~ msgstr "密码规则" - -#~ msgid "Change auth plan snapshot" -#~ msgstr "改密计划快照" - -#~ msgid "Change auth plan execution" -#~ msgstr "改密计划执行" - -#~ msgid "Change auth plan execution subtask" -#~ msgstr "改密计划执行子任务" - -#~ msgid "Authentication failed" -#~ msgstr "认证失败" - -#~ msgid "Connection timeout" -#~ msgstr "连接超时" - -#~ msgid "Plan detail" -#~ msgstr "计划详情" - -#~ msgid "Plan execution list" -#~ msgstr "执行列表" - -#~ msgid "Add asset to this plan" -#~ msgstr "添加资产" - -#~ msgid "Add node to this plan" -#~ msgstr "添加节点" - -#~ msgid "Length" -#~ msgstr "长度" - -#~ msgid "Execute plan" -#~ msgstr "执行计划" - -#~ msgid "Execute failed" -#~ msgstr "执行失败" - -#~ msgid "Execution list of plan" -#~ msgstr "执行列表" - -#~ msgid "Log" -#~ msgstr "日志" - -#~ msgid "Retry" -#~ msgstr "重试" - -#~ msgid "Run failed" -#~ msgstr "执行失败" - -#~ msgid "Create plan" -#~ msgstr "创建计划" - -#~ msgid "Plan list" -#~ msgstr "计划列表" - -#~ msgid "Update plan" -#~ msgstr "更新计划" - -#~ msgid "plan asset list" -#~ msgstr "计划资产列表" - -#~ msgid "Plan execution task list" -#~ msgstr "执行任务列表" - #~ msgid "Monitor" #~ msgstr "监控" diff --git a/apps/settings/utils.py b/apps/settings/utils.py index c0b90cfdf..c7dcf45b6 100644 --- a/apps/settings/utils.py +++ b/apps/settings/utils.py @@ -123,7 +123,10 @@ def save(users, exist): def set_default_item(item): item['source'] = 'ldap' if not item.get('email', ''): - item['email'] = item['username'] + '@' + item['username'] + '.com' + if '@' in item['username']: + item['email'] = item['username'] + else: + item['email'] = item['username'] + '@' + settings.EMAIL_SUFFIX if 'is_imported' in item.keys(): item.pop('is_imported') return item