From 7a219e17106d8df90ca0a95f8cb3d6cbec991b5c Mon Sep 17 00:00:00 2001 From: BaiJiangjie Date: Fri, 20 Apr 2018 11:23:31 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20OTP=E6=96=87=E6=A1=88=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAMFA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_asset_group_bulk_update_modal.html | 2 +- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 31742 -> 31755 bytes apps/i18n/zh/LC_MESSAGES/django.po | 105 +++++++++--------- apps/users/forms.py | 2 +- apps/users/templates/users/_base_otp.html | 2 +- apps/users/templates/users/login_otp.html | 2 +- apps/users/templates/users/user_detail.html | 6 +- apps/users/templates/users/user_profile.html | 27 ++--- apps/users/views/login.py | 2 +- apps/users/views/user.py | 12 +- 10 files changed, 80 insertions(+), 80 deletions(-) diff --git a/apps/assets/templates/assets/_asset_group_bulk_update_modal.html b/apps/assets/templates/assets/_asset_group_bulk_update_modal.html index 0e76ff923..61ac04fa6 100644 --- a/apps/assets/templates/assets/_asset_group_bulk_update_modal.html +++ b/apps/assets/templates/assets/_asset_group_bulk_update_modal.html @@ -31,7 +31,7 @@
- +
diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 19dcb5e7a0e0021ed5ac8ad0dfe0acd5f461acfd..535471a1cd132a830a27b0ef5edbc686f4e6cf77 100644 GIT binary patch delta 8841 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 KOJ>fP7xaG{w}%`6 delta 8814 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 diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po index c8de1947a..41f83403a 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-04-19 17:48+0800\n" +"POT-Creation-Date: 2018-04-20 11:17+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -346,7 +346,7 @@ msgstr "创建日期" #: users/models/user.py:52 users/templates/users/user_detail.html:119 #: users/templates/users/user_group_detail.html:67 #: users/templates/users/user_group_list.html:14 -#: users/templates/users/user_profile.html:122 +#: users/templates/users/user_profile.html:123 msgid "Comment" msgstr "备注" @@ -561,8 +561,9 @@ msgid "Select System Users" msgstr "选择系统用户" #: assets/templates/assets/_asset_group_bulk_update_modal.html:34 -msgid "Enable-OTP" -msgstr "二次验证" +#, fuzzy +msgid "Enable-MFA" +msgstr "启用MFA" #: assets/templates/assets/_asset_import_modal.html:4 msgid "Import asset" @@ -639,7 +640,7 @@ msgstr "其它" #: users/templates/users/_user.html:43 #: users/templates/users/user_bulk_update.html:23 #: users/templates/users/user_password_update.html:58 -#: users/templates/users/user_profile.html:180 +#: users/templates/users/user_profile.html:181 #: users/templates/users/user_profile_update.html:63 #: users/templates/users/user_pubkey_update.html:70 #: users/templates/users/user_pubkey_update.html:76 @@ -745,8 +746,8 @@ msgstr "测试" #: users/templates/users/user_group_detail.html:28 #: users/templates/users/user_group_list.html:43 #: users/templates/users/user_list.html:76 -#: users/templates/users/user_profile.html:143 -#: users/templates/users/user_profile.html:172 +#: users/templates/users/user_profile.html:144 +#: users/templates/users/user_profile.html:173 msgid "Update" msgstr "更新" @@ -794,7 +795,7 @@ msgstr "选择节点" #: users/templates/users/user_group_create_update.html:32 #: users/templates/users/user_group_list.html:86 #: users/templates/users/user_list.html:196 -#: users/templates/users/user_profile.html:214 +#: users/templates/users/user_profile.html:215 msgid "Confirm" msgstr "确认" @@ -845,14 +846,14 @@ msgstr "硬盘" #: assets/templates/assets/asset_detail.html:121 #: users/templates/users/user_detail.html:111 -#: users/templates/users/user_profile.html:96 +#: users/templates/users/user_profile.html:97 msgid "Date joined" msgstr "创建日期" #: assets/templates/assets/asset_detail.html:137 #: terminal/templates/terminal/session_detail.html:81 #: users/templates/users/user_detail.html:130 -#: users/templates/users/user_profile.html:134 +#: users/templates/users/user_profile.html:135 msgid "Quick modify" msgstr "快速修改" @@ -1730,7 +1731,7 @@ msgstr "" #: perms/models.py:27 perms/models.py:71 #: perms/templates/perms/asset_permission_detail.html:90 #: users/models/user.py:54 users/templates/users/user_detail.html:103 -#: users/templates/users/user_profile.html:104 +#: users/templates/users/user_profile.html:105 msgid "Date expired" msgstr "失效日期" @@ -2229,7 +2230,7 @@ msgid "Invalid token or cache refreshed." msgstr "" #: users/forms.py:30 -msgid "Otp_code" +msgid "MFA_code" msgstr "" #: users/forms.py:39 users/models/user.py:43 @@ -2290,7 +2291,7 @@ msgstr "复制你的公钥到这里" #: users/forms.py:181 users/models/user.py:51 #: users/templates/users/user_password_update.html:43 -#: users/templates/users/user_profile.html:79 +#: users/templates/users/user_profile.html:68 #: users/templates/users/user_profile_update.html:43 #: users/templates/users/user_pubkey_update.html:43 msgid "Public key" @@ -2328,18 +2329,18 @@ msgstr "管理员" msgid "Application" msgstr "应用程序" -#: users/models/user.py:34 users/templates/users/user_profile.html:74 -#: users/templates/users/user_profile.html:155 -#: users/templates/users/user_profile.html:158 +#: users/models/user.py:34 users/templates/users/user_profile.html:92 +#: users/templates/users/user_profile.html:156 +#: users/templates/users/user_profile.html:159 msgid "Disable" msgstr "禁用" -#: users/models/user.py:35 users/templates/users/user_profile.html:72 -#: users/templates/users/user_profile.html:162 +#: users/models/user.py:35 users/templates/users/user_profile.html:90 +#: users/templates/users/user_profile.html:163 msgid "Enable" msgstr "启用" -#: users/models/user.py:36 users/templates/users/user_profile.html:70 +#: users/models/user.py:36 users/templates/users/user_profile.html:88 msgid "Force enable" msgstr "强制启用" @@ -2356,7 +2357,7 @@ msgstr "头像" msgid "Wechat" msgstr "微信" -#: users/models/user.py:47 users/templates/users/user_detail.html:91 +#: users/models/user.py:47 msgid "Enable OTP" msgstr "二次验证" @@ -2457,8 +2458,10 @@ msgid "City" msgstr "城市" #: users/templates/users/login_otp.html:45 -msgid "二次认证" -msgstr "" +#: users/templates/users/user_detail.html:91 +#: users/templates/users/user_profile.html:85 +msgid "MFA certification" +msgstr "MFA认证" #: users/templates/users/login_otp.html:64 #: users/templates/users/user_otp_authentication.html:19 @@ -2468,7 +2471,7 @@ msgstr "6位数字" #: users/templates/users/login_otp.html:69 msgid "Can't provide security? Please contact the administrator!" -msgstr "如果不能提供OTP验证码，请联系管理员!" +msgstr "如果不能提供MFA验证码，请联系管理员!" #: users/templates/users/reset_password.html:45 #: users/templates/users/user_detail.html:348 users/utils.py:73 @@ -2514,13 +2517,13 @@ msgid "Disabled" msgstr "禁用" #: users/templates/users/user_detail.html:115 -#: users/templates/users/user_profile.html:100 +#: users/templates/users/user_profile.html:101 msgid "Last login" msgstr "最后登录" #: users/templates/users/user_detail.html:151 -msgid "Force enabled OTP" -msgstr "强制启用OTP" +msgid "Force enabled MFA" +msgstr "强制启用MFA" #: users/templates/users/user_detail.html:166 msgid "Send reset password mail" @@ -2536,8 +2539,8 @@ msgid "Send reset ssh key mail" msgstr "发送重置密钥邮件" #: users/templates/users/user_detail.html:291 -msgid "Goto profile page enable otp" -msgstr "请去个人信息页面启用自己的OTP" +msgid "Goto profile page enable MFA" +msgstr "请去个人信息页面启用自己的MFA" #: users/templates/users/user_detail.html:347 msgid "An e-mail has been sent to the user`s mailbox." @@ -2562,14 +2565,14 @@ msgid "This will reset the user public key and send a reset mail" msgstr "将会失效用户当前密钥，并发送重置邮件到用户邮箱" #: users/templates/users/user_detail.html:400 -#: users/templates/users/user_profile.html:203 +#: users/templates/users/user_profile.html:204 msgid "Successfully updated the SSH public key." msgstr "更新ssh密钥成功" #: users/templates/users/user_detail.html:401 #: users/templates/users/user_detail.html:405 -#: users/templates/users/user_profile.html:204 -#: users/templates/users/user_profile.html:209 +#: users/templates/users/user_profile.html:205 +#: users/templates/users/user_profile.html:210 msgid "User SSH public key update" msgstr "ssh密钥" @@ -2625,32 +2628,28 @@ msgstr "删除" msgid "User Deleting failed." msgstr "用户删除失败" -#: users/templates/users/user_profile.html:67 -msgid "OTP" -msgstr "" - -#: users/templates/users/user_profile.html:108 users/views/user.py:185 +#: users/templates/users/user_profile.html:109 users/views/user.py:185 #: users/views/user.py:239 msgid "User groups" msgstr "用户组" -#: users/templates/users/user_profile.html:140 +#: users/templates/users/user_profile.html:141 msgid "Update password" msgstr "更改密码" -#: users/templates/users/user_profile.html:148 -msgid "Update otp" -msgstr "更改OTP设置" +#: users/templates/users/user_profile.html:149 +msgid "Update MFA settings" +msgstr "更改MFA设置" -#: users/templates/users/user_profile.html:169 +#: users/templates/users/user_profile.html:170 msgid "Update SSH public key" msgstr "更改SSH密钥" -#: users/templates/users/user_profile.html:177 +#: users/templates/users/user_profile.html:178 msgid "Reset public key and download" msgstr "重置并下载SSH密钥" -#: users/templates/users/user_profile.html:207 +#: users/templates/users/user_profile.html:208 msgid "Failed to update SSH public key." msgstr "更新密钥失败" @@ -2821,8 +2820,8 @@ msgid "Please enable cookies and try again." msgstr "设置你的浏览器支持cookie" #: users/views/login.py:107 users/views/user.py:464 users/views/user.py:489 -msgid "Otp code invalid" -msgstr "otp码认证失败" +msgid "MFA code invalid" +msgstr "MFA码认证失败" #: users/views/login.py:133 msgid "Logout success" @@ -2898,20 +2897,20 @@ msgid "Password invalid" msgstr "用户名或密码无效" #: users/views/user.py:515 -msgid "OTP enable success" -msgstr "OTP 绑定成功" +msgid "MFA enable success" +msgstr "MFA 绑定成功" #: users/views/user.py:516 -msgid "OTP enable success, return login page" -msgstr "OTP 绑定成功，返回到登录页面" +msgid "MFA enable success, return login page" +msgstr "MFA 绑定成功，返回到登录页面" #: users/views/user.py:518 -msgid "OTP disable success" -msgstr "OTP 解绑成功" +msgid "MFA disable success" +msgstr "MFA 解绑成功" #: users/views/user.py:519 -msgid "OTP disable success, return login page" -msgstr "OTP 解绑成功，返回登录页面" +msgid "MFA disable success, return login page" +msgstr "MFA 解绑成功，返回登录页面" #~ msgid "Add asset" #~ msgstr "添加资产到节点" diff --git a/apps/users/forms.py b/apps/users/forms.py index 03b1e21cb..5af28756b 100644 --- a/apps/users/forms.py +++ b/apps/users/forms.py @@ -27,7 +27,7 @@ class UserCheckPasswordForm(forms.Form): class UserCheckOtpCodeForm(forms.Form): - otp_code = forms.CharField(label=_('Otp_code'), max_length=6) + otp_code = forms.CharField(label=_('MFA_code'), max_length=6) class UserCreateUpdateForm(forms.ModelForm): diff --git a/apps/users/templates/users/_base_otp.html b/apps/users/templates/users/_base_otp.html index cd9c43edc..a6eca32d9 100644 --- a/apps/users/templates/users/_base_otp.html +++ b/apps/users/templates/users/_base_otp.html @@ -54,7 +54,7 @@ -
绑定TOTP
+
绑定MFA
  • diff --git a/apps/users/templates/users/login_otp.html b/apps/users/templates/users/login_otp.html index de201ce8c..1edde0b59 100644 --- a/apps/users/templates/users/login_otp.html +++ b/apps/users/templates/users/login_otp.html @@ -42,7 +42,7 @@
    - {% trans '二次认证' %} + {% trans 'MFA certification' %}
    diff --git a/apps/users/templates/users/user_detail.html b/apps/users/templates/users/user_detail.html index d062a0a3c..66bfa61e0 100644 --- a/apps/users/templates/users/user_detail.html +++ b/apps/users/templates/users/user_detail.html @@ -88,7 +88,7 @@ {{ user_object.get_role_display }} - {% trans 'Enable OTP' %}: + {% trans 'MFA certification' %}: {% if user_object.otp_force_enabled %} {% trans 'Force enabled' %} @@ -148,7 +148,7 @@ - {% trans 'Force enabled OTP' %}: + {% trans 'Force enabled MFA' %}:
    @@ -288,7 +288,7 @@ $(document).ready(function() { }) .on('click', '#force_enable_otp', function() { {% if request.user == user_object %} - toastr.error("{% trans 'Goto profile page enable otp' %}"); + toastr.error("{% trans 'Goto profile page enable MFA' %}"); return {% endif %} diff --git a/apps/users/templates/users/user_profile.html b/apps/users/templates/users/user_profile.html index 6cda70eb9..3efc193c9 100644 --- a/apps/users/templates/users/user_profile.html +++ b/apps/users/templates/users/user_profile.html @@ -63,18 +63,7 @@ {% trans 'Active' %} {{ user.is_active|yesno:"Yes,No,Unkown" }} - - {% trans 'OTP' %} - - {% if user.otp_force_enabled %} - {% trans 'Force enable' %} - {% elif user.otp_enabled%} - {% trans 'Enable' %} - {% else %} - {% trans 'Disable' %} - {% endif %} - - + {% trans 'Public key' %} @@ -92,6 +81,18 @@ + + {% trans 'MFA certification' %} + + {% if user.otp_force_enabled %} + {% trans 'Force enable' %} + {% elif user.otp_enabled%} + {% trans 'Enable' %} + {% else %} + {% trans 'Disable' %} + {% endif %} + + {% trans 'Date joined' %} {{ user.date_joined|date:"Y-m-d H:i:s" }} @@ -145,7 +146,7 @@ - {% trans 'Update otp' %}: + {% trans 'Update MFA settings' %}: