From e74289b2232864a8b050af2516f4c75d067dbe04 Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Fri, 17 Apr 2020 23:41:50 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=87=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA2=20(#3914)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 89671 -> 89528 bytes apps/locale/zh/LC_MESSAGES/django.po | 143 +++++++++++++-------------- apps/users/views/login.py | 9 +- 3 files changed, 73 insertions(+), 79 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 838a92b2287e57a15c99e8d1e5b1e46ca3ad06c2..126defb5619feee38247c0be8c684584080455cb 100644 GIT binary patch delta 26150 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 VoV-zdTb|&6O=Y*mjSZ*}{(pZ?(ry3% delta 26270 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index f1e5999e4..01a3bc023 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: 2020-04-13 13:44+0800\n" +"POT-Creation-Date: 2020-04-17 20:49+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -58,8 +58,7 @@ msgstr "自定义" #: 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:269 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:37 +#: xpack/plugins/cloud/models.py:266 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:47 #: xpack/plugins/orgs/templates/orgs/org_list.html:17 #: xpack/plugins/vault/forms.py:13 xpack/plugins/vault/forms.py:15 @@ -143,8 +142,8 @@ msgstr "运行参数" #: perms/templates/perms/remote_app_permission_user.html:49 #: settings/models.py:26 #: settings/templates/settings/_ldap_list_users_modal.html:32 -#: terminal/models.py:26 terminal/models.py:341 terminal/models.py:373 -#: terminal/models.py:410 terminal/templates/terminal/base_storage_list.html:31 +#: terminal/models.py:26 terminal/models.py:342 terminal/models.py:374 +#: terminal/models.py:411 terminal/templates/terminal/base_storage_list.html:31 #: terminal/templates/terminal/terminal_detail.html:43 #: terminal/templates/terminal/terminal_list.html:30 users/forms/profile.py:20 #: users/models/group.py:15 users/models/user.py:440 @@ -183,7 +182,7 @@ msgstr "名称" #: assets/templates/assets/cmd_filter_rule_list.html:53 #: audits/templates/audits/login_log_list.html:58 #: perms/templates/perms/remote_app_permission_remote_app.html:50 -#: terminal/models.py:375 terminal/models.py:412 +#: terminal/models.py:376 terminal/models.py:413 #: terminal/templates/terminal/base_storage_list.html:32 #: tickets/models/ticket.py:43 tickets/templates/tickets/ticket_detail.html:33 #: tickets/templates/tickets/ticket_list.html:35 @@ -248,8 +247,8 @@ msgstr "数据库" #: perms/templates/perms/asset_permission_detail.html:97 #: perms/templates/perms/database_app_permission_detail.html:93 #: perms/templates/perms/remote_app_permission_detail.html:89 -#: settings/models.py:31 terminal/models.py:36 terminal/models.py:380 -#: terminal/models.py:417 terminal/templates/terminal/base_storage_list.html:33 +#: settings/models.py:31 terminal/models.py:36 terminal/models.py:381 +#: terminal/models.py:418 terminal/templates/terminal/base_storage_list.html:33 #: terminal/templates/terminal/terminal_detail.html:63 #: tickets/templates/tickets/ticket_detail.html:104 users/models/group.py:16 #: users/models/user.py:473 users/templates/users/user_detail.html:115 @@ -261,10 +260,10 @@ msgstr "数据库" #: xpack/plugins/change_auth_plan/models.py:75 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:115 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:19 -#: xpack/plugins/cloud/models.py:53 xpack/plugins/cloud/models.py:139 +#: xpack/plugins/cloud/models.py:53 xpack/plugins/cloud/models.py:136 #: xpack/plugins/cloud/templates/cloud/account_detail.html:67 #: xpack/plugins/cloud/templates/cloud/account_list.html:15 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:128 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:102 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:18 #: xpack/plugins/gathered_user/models.py:26 #: xpack/plugins/orgs/templates/orgs/org_detail.html:59 @@ -324,7 +323,7 @@ msgstr "参数" #: users/templates/users/user_detail.html:97 #: xpack/plugins/change_auth_plan/models.py:79 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:111 -#: xpack/plugins/cloud/models.py:56 xpack/plugins/cloud/models.py:145 +#: xpack/plugins/cloud/models.py:56 xpack/plugins/cloud/models.py:142 #: xpack/plugins/gathered_user/models.py:30 msgid "Created by" msgstr "创建者" @@ -351,9 +350,9 @@ msgstr "创建者" #: tickets/templates/tickets/ticket_detail.html:52 users/models/group.py:18 #: users/templates/users/user_group_detail.html:58 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:103 -#: xpack/plugins/cloud/models.py:59 xpack/plugins/cloud/models.py:148 +#: xpack/plugins/cloud/models.py:59 xpack/plugins/cloud/models.py:145 #: xpack/plugins/cloud/templates/cloud/account_detail.html:63 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:108 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:98 #: xpack/plugins/orgs/templates/orgs/org_detail.html:55 msgid "Date created" msgstr "创建日期" @@ -406,7 +405,7 @@ msgstr "远程应用" #: users/templates/users/user_pubkey_update.html:80 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:65 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:29 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:52 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:49 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:40 #: xpack/plugins/interface/templates/interface/interface.html:72 #: xpack/plugins/orgs/templates/orgs/org_create_update.html:29 @@ -872,7 +871,6 @@ msgstr "用户名" #: ops/templates/ops/task_detail.html:95 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:82 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:72 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:82 msgid "Yes" msgstr "是" @@ -880,7 +878,6 @@ msgstr "是" #: ops/templates/ops/task_detail.html:97 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:84 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:74 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:84 msgid "No" msgstr "否" @@ -1410,7 +1407,7 @@ msgstr "资产管理" #: assets/models/user.py:111 assets/templates/assets/system_user_users.html:76 #: templates/_nav.html:17 users/views/group.py:28 users/views/group.py:45 #: users/views/group.py:63 users/views/group.py:82 users/views/group.py:99 -#: users/views/login.py:158 users/views/profile/password.py:40 +#: users/views/login.py:164 users/views/profile/password.py:40 #: users/views/profile/pubkey.py:36 users/views/user.py:50 #: users/views/user.py:67 users/views/user.py:111 users/views/user.py:178 #: users/views/user.py:206 users/views/user.py:220 users/views/user.py:234 @@ -1731,7 +1728,7 @@ msgstr "资产列表" #: ops/templates/ops/command_execution_create.html:112 #: settings/templates/settings/_ldap_list_users_modal.html:41 #: users/templates/users/_granted_assets.html:7 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:65 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:62 msgid "Loading" msgstr "加载中" @@ -1891,7 +1888,7 @@ msgstr "自动生成密钥" #: perms/templates/perms/remote_app_permission_create_update.html:51 #: terminal/templates/terminal/terminal_update.html:38 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:61 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:47 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:44 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:35 msgid "Other" msgstr "其它" @@ -1960,7 +1957,7 @@ msgstr "选择节点" #: users/templates/users/user_list.html:184 #: users/templates/users/user_password_verify.html:20 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:30 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:53 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:50 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:41 #: xpack/plugins/interface/templates/interface/interface.html:103 #: xpack/plugins/orgs/templates/orgs/org_create_update.html:30 @@ -2000,7 +1997,7 @@ msgstr "资产用户" #: users/templates/users/user_detail.html:126 #: users/templates/users/user_profile.html:150 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:126 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:139 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:129 #: xpack/plugins/license/templates/license/license_detail.html:80 msgid "Quick modify" msgstr "快速修改" @@ -2533,7 +2530,7 @@ msgstr "启用" msgid "-" msgstr "" -#: audits/models.py:78 xpack/plugins/cloud/models.py:204 +#: audits/models.py:78 xpack/plugins/cloud/models.py:201 msgid "Failed" msgstr "失败" @@ -2566,7 +2563,7 @@ msgstr "多因子认证" #: audits/models.py:87 audits/templates/audits/login_log_list.html:63 #: xpack/plugins/change_auth_plan/models.py:286 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:15 -#: xpack/plugins/cloud/models.py:217 +#: xpack/plugins/cloud/models.py:214 msgid "Reason" msgstr "原因" @@ -2574,7 +2571,7 @@ msgstr "原因" #: tickets/templates/tickets/ticket_detail.html:34 #: tickets/templates/tickets/ticket_list.html:36 #: tickets/templates/tickets/ticket_list.html:104 -#: xpack/plugins/cloud/models.py:214 xpack/plugins/cloud/models.py:272 +#: xpack/plugins/cloud/models.py:211 xpack/plugins/cloud/models.py:269 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:50 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:48 msgid "Status" @@ -2642,8 +2639,8 @@ msgstr "导出" msgid "Handlers" msgstr "操作者" -#: audits/views.py:86 audits/views.py:130 audits/views.py:167 -#: audits/views.py:212 audits/views.py:244 templates/_nav.html:146 +#: audits/views.py:86 audits/views.py:131 audits/views.py:168 +#: audits/views.py:213 audits/views.py:245 templates/_nav.html:146 msgid "Audits" msgstr "日志审计" @@ -2651,19 +2648,19 @@ msgstr "日志审计" msgid "FTP log" msgstr "FTP日志" -#: audits/views.py:131 templates/_nav.html:151 +#: audits/views.py:132 templates/_nav.html:151 msgid "Operate log" msgstr "操作日志" -#: audits/views.py:168 templates/_nav.html:152 +#: audits/views.py:169 templates/_nav.html:152 msgid "Password change log" msgstr "改密日志" -#: audits/views.py:213 templates/_nav.html:149 +#: audits/views.py:214 templates/_nav.html:149 msgid "Login log" msgstr "登录日志" -#: audits/views.py:245 +#: audits/views.py:246 msgid "Command execution log" msgstr "命令执行" @@ -3047,13 +3044,13 @@ msgstr "没有该主机 {} 权限" #: ops/mixin.py:29 ops/mixin.py:92 ops/mixin.py:162 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:98 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:98 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:88 msgid "Cycle perform" msgstr "周期执行" #: ops/mixin.py:33 ops/mixin.py:90 ops/mixin.py:111 ops/mixin.py:150 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:90 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:90 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:80 msgid "Regularly perform" msgstr "定期执行" @@ -3061,8 +3058,8 @@ msgstr "定期执行" #: 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:79 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:17 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:40 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:79 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:37 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:69 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:16 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:28 msgid "Periodic perform" @@ -3183,7 +3180,7 @@ msgstr "{} 任务结束" #: ops/models/command.py:24 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:56 -#: xpack/plugins/cloud/models.py:212 +#: xpack/plugins/cloud/models.py:209 msgid "Result" msgstr "结果" @@ -3401,7 +3398,7 @@ msgstr "内容" #: ops/templates/ops/task_list.html:73 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:135 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:54 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:148 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:138 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:58 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:44 msgid "Run" @@ -3836,11 +3833,11 @@ msgstr "远程应用授权远程应用列表" msgid "Test mail sent to {}, please check" msgstr "邮件已经发送{}, 请检查" -#: settings/api.py:227 +#: settings/api.py:242 msgid "Get ldap users is None" msgstr "获取 LDAP 用户为 None" -#: settings/api.py:234 +#: settings/api.py:249 msgid "Imported {} users successfully" msgstr "导入 {} 个用户成功" @@ -4883,9 +4880,9 @@ msgid "" " " msgstr "" -#: terminal/forms/storage.py:136 xpack/plugins/cloud/models.py:266 +#: terminal/forms/storage.py:136 xpack/plugins/cloud/models.py:263 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:29 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:112 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:106 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:46 msgid "Region" msgstr "地域" @@ -4976,7 +4973,7 @@ msgstr "回放" msgid "Date end" msgstr "结束日期" -#: terminal/models.py:342 +#: terminal/models.py:343 msgid "Args" msgstr "参数" @@ -5404,7 +5401,7 @@ msgstr "复制用户公钥到这里" msgid "Join user groups" msgstr "添加到用户组" -#: users/forms/user.py:103 users/views/login.py:119 +#: users/forms/user.py:103 users/views/login.py:124 #: users/views/profile/password.py:57 msgid "* Your password does not meet the requirements" msgstr "* 您的密码不符合要求" @@ -5923,8 +5920,8 @@ msgstr "新的公钥已设置成功，请下载对应的私钥" msgid "Update user" msgstr "更新用户" -#: users/templates/users/user_update.html:22 users/views/login.py:48 -#: users/views/login.py:113 +#: users/templates/users/user_update.html:22 users/views/login.py:49 +#: users/views/login.py:117 msgid "User auth from {}, go there change password" msgstr "用户认证源来自 {}, 请去相应系统修改密码" @@ -6146,28 +6143,28 @@ msgstr "用户组授权资产" msgid "Email address invalid, please input again" msgstr "邮箱地址错误，重新输入" -#: users/views/login.py:61 +#: users/views/login.py:63 msgid "Send reset password message" msgstr "发送重置密码邮件" -#: users/views/login.py:62 +#: users/views/login.py:64 msgid "Send reset password mail success, login your mail box and follow it " msgstr "" "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)" -#: users/views/login.py:75 +#: users/views/login.py:77 msgid "Reset password success" msgstr "重置密码成功" -#: users/views/login.py:76 +#: users/views/login.py:78 msgid "Reset password success, return to login page" msgstr "重置密码成功，返回到登录页面" -#: users/views/login.py:100 users/views/login.py:110 +#: users/views/login.py:102 users/views/login.py:112 msgid "Token invalid or expired" msgstr "Token错误或失效" -#: users/views/login.py:158 +#: users/views/login.py:164 msgid "First login" msgstr "首次登录" @@ -6423,10 +6420,6 @@ msgstr "选择节点" msgid "Select admins" msgstr "选择管理员" -#: xpack/plugins/cloud/forms.py:85 -msgid "Tips: The asset information is always covered" -msgstr "提示：资产信息总是被覆盖" - #: xpack/plugins/cloud/meta.py:9 xpack/plugins/cloud/views.py:27 #: xpack/plugins/cloud/views.py:44 xpack/plugins/cloud/views.py:62 #: xpack/plugins/cloud/views.py:78 xpack/plugins/cloud/views.py:92 @@ -6471,52 +6464,48 @@ msgstr "地域" msgid "Instances" msgstr "实例" -#: xpack/plugins/cloud/models.py:136 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:69 -msgid "Covered always" -msgstr "总是覆盖" - -#: xpack/plugins/cloud/models.py:142 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:104 +#: xpack/plugins/cloud/models.py:139 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:94 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:17 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:153 xpack/plugins/cloud/models.py:210 +#: xpack/plugins/cloud/models.py:150 xpack/plugins/cloud/models.py:207 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack/plugins/cloud/models.py:205 +#: xpack/plugins/cloud/models.py:202 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/models.py:220 xpack/plugins/cloud/models.py:275 +#: xpack/plugins/cloud/models.py:217 xpack/plugins/cloud/models.py:272 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:51 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:49 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:248 +#: xpack/plugins/cloud/models.py:245 msgid "Unsync" msgstr "未同步" -#: xpack/plugins/cloud/models.py:249 xpack/plugins/cloud/models.py:250 +#: xpack/plugins/cloud/models.py:246 xpack/plugins/cloud/models.py:247 msgid "Synced" msgstr "已同步" -#: xpack/plugins/cloud/models.py:251 +#: xpack/plugins/cloud/models.py:248 msgid "Released" msgstr "已释放" -#: xpack/plugins/cloud/models.py:256 +#: xpack/plugins/cloud/models.py:253 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:260 +#: xpack/plugins/cloud/models.py:257 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:263 +#: xpack/plugins/cloud/models.py:260 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:114 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:45 msgid "Instance" msgstr "实例" @@ -6595,7 +6584,7 @@ msgstr "创建账户" msgid "Node & AdminUser" msgstr "节点 & 管理用户" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:66 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:63 msgid "Load failed" msgstr "加载失败" @@ -6620,11 +6609,11 @@ msgstr "同步历史列表" msgid "Sync instance list" msgstr "同步实例列表" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:145 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:135 msgid "Run task manually" msgstr "手动执行任务" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:188 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:178 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:102 msgid "Sync success" msgstr "同步成功" @@ -6661,7 +6650,7 @@ msgstr "执行次数" msgid "Instance count" msgstr "实例个数" -#: xpack/plugins/cloud/utils.py:38 +#: xpack/plugins/cloud/utils.py:37 msgid "Account unavailable" msgstr "账户无效" @@ -6955,6 +6944,12 @@ msgstr "密码匣子" msgid "vault create" msgstr "创建" +#~ msgid "Tips: The asset information is always covered" +#~ msgstr "提示：资产信息总是被覆盖" + +#~ msgid "Covered always" +#~ msgstr "总是覆盖" + #~ msgid "* For security, do not change {}'s password" #~ msgstr "* 为了安全，不能修改 {} 的密码" diff --git a/apps/users/views/login.py b/apps/users/views/login.py index 74bb411ab..44a6ffe2b 100644 --- a/apps/users/views/login.py +++ b/apps/users/views/login.py @@ -46,9 +46,8 @@ class UserForgotPasswordView(FormView): form.add_error('email', error) return self.form_invalid(form) elif not user.can_update_password(): - error = _('User auth from {}, go there change password'.format( - user.source)) - form.add_error('email', error) + error = _('User auth from {}, go there change password') + form.add_error('email', error.format(user.get_source_display())) return self.form_invalid(form) else: send_reset_password_mail(user) @@ -114,8 +113,8 @@ class UserResetPasswordView(FormView): return self.form_invalid(form) if not user.can_update_password(): - error = _('User auth from {}, go there change password'.format(user.source)) - form.add_error('new_password', error) + error = _('User auth from {}, go there change password') + form.add_error('new_password', error.format(user.get_source_display())) return self.form_invalid(form) password = form.cleaned_data['new_password']