From 5f2c31e42c828eecc5cc9e58a4e89fecf51c9791 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Thu, 7 Jun 2018 12:29:55 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E9=87=8D=E7=BD=AE=E5=85=AC=E9=92=A5?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=88=90=E5=8A=9F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?(user-pubkey-update)/=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E6=AD=A5(first-login)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 34427 -> 34591 bytes apps/i18n/zh/LC_MESSAGES/django.po | 64 ++++++++++-------- apps/users/templates/users/first_login.html | 15 ++-- .../templates/users/user_pubkey_update.html | 7 +- 4 files changed, 49 insertions(+), 37 deletions(-) diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index ace72c44b090277540ec8b072d5da101656d52b4..7d2f547cd060a8f9bcb6920ecac28ce737ebe3df 100644 GIT binary patch delta 9938 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 diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po index cc9ee531d..705f611dc 100644 --- a/apps/i18n/zh/LC_MESSAGES/django.po +++ b/apps/i18n/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: 2018-06-06 16:53+0800\n" +"POT-Creation-Date: 2018-06-07 11:34+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -392,7 +392,7 @@ msgid "Default" msgstr "默认" #: assets/models/cluster.py:36 assets/models/label.py:13 -#: users/models/user.py:347 +#: users/models/user.py:343 msgid "System" msgstr "系统" @@ -432,9 +432,9 @@ msgstr "默认资产组" #: terminal/templates/terminal/command_list.html:72 #: terminal/templates/terminal/session_list.html:33 #: terminal/templates/terminal/session_list.html:71 users/forms.py:281 -#: users/models/user.py:31 users/models/user.py:335 +#: users/models/user.py:31 users/models/user.py:331 #: users/templates/users/user_group_detail.html:78 -#: users/templates/users/user_group_list.html:13 users/views/user.py:359 +#: users/templates/users/user_group_list.html:13 users/views/user.py:362 msgid "User" msgstr "用户" @@ -1965,7 +1965,7 @@ msgstr "文档" #: users/templates/users/user_profile.html:17 #: users/templates/users/user_profile_update.html:37 #: users/templates/users/user_profile_update.html:57 -#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:341 +#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:344 msgid "Profile" msgstr "个人信息" @@ -2022,13 +2022,13 @@ msgstr "关闭" #: templates/_nav.html:10 users/views/group.py:28 users/views/group.py:44 #: users/views/group.py:62 users/views/group.py:79 users/views/group.py:95 -#: users/views/login.py:277 users/views/login.py:335 users/views/user.py:65 -#: users/views/user.py:80 users/views/user.py:102 users/views/user.py:173 -#: users/views/user.py:328 users/views/user.py:378 users/views/user.py:413 +#: users/views/login.py:277 users/views/login.py:335 users/views/user.py:66 +#: users/views/user.py:81 users/views/user.py:103 users/views/user.py:174 +#: users/views/user.py:329 users/views/user.py:381 users/views/user.py:416 msgid "Users" msgstr "用户管理" -#: templates/_nav.html:13 users/views/user.py:66 +#: templates/_nav.html:13 users/views/user.py:67 msgid "User list" msgstr "用户列表" @@ -2464,7 +2464,7 @@ msgstr "Agent" msgid "Date login" msgstr "登录日期" -#: users/models/user.py:30 users/models/user.py:343 +#: users/models/user.py:30 users/models/user.py:339 msgid "Administrator" msgstr "管理员" @@ -2506,7 +2506,7 @@ msgstr "微信" msgid "Source" msgstr "用户来源" -#: users/models/user.py:346 +#: users/models/user.py:342 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -2649,7 +2649,7 @@ msgid "Setting" msgstr "设置" #: users/templates/users/user_create.html:4 -#: users/templates/users/user_list.html:16 users/views/user.py:80 +#: users/templates/users/user_list.html:16 users/views/user.py:81 msgid "Create user" msgstr "创建用户" @@ -2658,7 +2658,7 @@ msgid "Reset link will be generated and sent to the user. " msgstr "生成重置密码连接,通过邮件发送给用户" #: users/templates/users/user_detail.html:19 -#: users/templates/users/user_granted_asset.html:18 users/views/user.py:174 +#: users/templates/users/user_granted_asset.html:18 users/views/user.py:175 msgid "User detail" msgstr "用户详情" @@ -2793,8 +2793,8 @@ msgstr "用户删除失败" msgid "Administrator Settings force MFA login" msgstr "管理员设置强制使用MFA登录" -#: users/templates/users/user_profile.html:116 users/views/user.py:203 -#: users/views/user.py:257 +#: users/templates/users/user_profile.html:116 users/views/user.py:204 +#: users/views/user.py:258 msgid "User groups" msgstr "用户组" @@ -2834,7 +2834,13 @@ msgstr "更新密钥" msgid "Or reset by server" msgstr "或者重置并下载密钥" -#: users/templates/users/user_update.html:4 users/views/user.py:103 +#: users/templates/users/user_pubkey_update.html:94 +msgid "" +"The new public key has been set successfully, Please download the " +"corresponding private key." +msgstr "新的公钥已设置成功,请下载对应的私钥" + +#: users/templates/users/user_update.html:4 users/views/user.py:104 msgid "Update user" msgstr "更新用户" @@ -2992,7 +2998,7 @@ msgstr "用户组授权资产" msgid "Please enable cookies and try again." msgstr "设置你的浏览器支持cookie" -#: users/views/login.py:128 users/views/user.py:498 users/views/user.py:523 +#: users/views/login.py:128 users/views/user.py:501 users/views/user.py:526 msgid "MFA code invalid" msgstr "MFA码认证失败" @@ -3033,7 +3039,7 @@ msgstr "Token错误或失效" msgid "Password not same" msgstr "密码不一致" -#: users/views/login.py:239 users/views/user.py:115 users/views/user.py:396 +#: users/views/login.py:239 users/views/user.py:116 users/views/user.py:399 msgid "* Your password does not meet the requirements" msgstr "* 您的密码不符合要求" @@ -3045,46 +3051,46 @@ msgstr "首次登陆" msgid "Login log list" msgstr "登录日志" -#: users/views/user.py:127 +#: users/views/user.py:128 msgid "Bulk update user success" msgstr "批量更新用户成功" -#: users/views/user.py:232 +#: users/views/user.py:233 msgid "Invalid file." msgstr "文件不合法" -#: users/views/user.py:329 +#: users/views/user.py:330 msgid "User granted assets" msgstr "用户授权资产" -#: users/views/user.py:360 +#: users/views/user.py:363 msgid "Profile setting" msgstr "个人信息设置" -#: users/views/user.py:379 +#: users/views/user.py:382 msgid "Password update" msgstr "密码更新" -#: users/views/user.py:414 +#: users/views/user.py:417 msgid "Public key update" msgstr "密钥更新" -#: users/views/user.py:455 +#: users/views/user.py:458 msgid "Password invalid" msgstr "用户名或密码无效" -#: users/views/user.py:549 +#: users/views/user.py:552 msgid "MFA enable success" msgstr "MFA 绑定成功" -#: users/views/user.py:550 +#: users/views/user.py:553 msgid "MFA enable success, return login page" msgstr "MFA 绑定成功,返回到登录页面" -#: users/views/user.py:552 +#: users/views/user.py:555 msgid "MFA disable success" msgstr "MFA 解绑成功" -#: users/views/user.py:553 +#: users/views/user.py:556 msgid "MFA disable success, return login page" msgstr "MFA 解绑成功,返回登录页面" diff --git a/apps/users/templates/users/first_login.html b/apps/users/templates/users/first_login.html index 170bfdd32..9687949d1 100644 --- a/apps/users/templates/users/first_login.html +++ b/apps/users/templates/users/first_login.html @@ -122,10 +122,10 @@ {% block custom_foot_js %} {% endblock %} diff --git a/apps/users/templates/users/user_pubkey_update.html b/apps/users/templates/users/user_pubkey_update.html index 82c4a3590..e90e51659 100644 --- a/apps/users/templates/users/user_pubkey_update.html +++ b/apps/users/templates/users/user_pubkey_update.html @@ -67,7 +67,7 @@
@@ -89,5 +89,10 @@ {% block custom_foot_js %} {% endblock %}