From 157d81f1178d7072ae8654e518113b5d60ad186d Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 15 Nov 2022 18:09:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BF=BB=E8=AF=91=20(#9067)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> --- apps/locale/ja/LC_MESSAGES/django.mo | 4 +-- apps/locale/ja/LC_MESSAGES/django.po | 46 ++++++++++++++++--------- apps/locale/zh/LC_MESSAGES/django.mo | 4 +-- apps/locale/zh/LC_MESSAGES/django.po | 51 ++++++++++++++++------------ 4 files changed, 64 insertions(+), 41 deletions(-) diff --git a/apps/locale/ja/LC_MESSAGES/django.mo b/apps/locale/ja/LC_MESSAGES/django.mo index 36745934b..ef4ae4516 100644 --- a/apps/locale/ja/LC_MESSAGES/django.mo +++ b/apps/locale/ja/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a6fa767ad61ceb6e28454df27a050549f9e093577e93a5878b29740689c46b5 -size 132544 +oid sha256:c612630da01a1ec5265966e044f6cf98d557f7db507e9d23c8ba15d409adfbed +size 132739 diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index a1b37e2c4..da2a4cfca 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-15 16:44+0800\n" +"POT-Creation-Date: 2022-11-15 18:06+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1678,8 +1678,8 @@ msgstr "この操作には、MFAを検証する必要があります" msgid "Current user not support mfa type: {}" msgstr "現在のユーザーはmfaタイプをサポートしていません: {}" -#: authentication/api/password.py:30 terminal/api/session.py:224 -#: users/views/profile/reset.py:45 users/views/profile/reset.py:119 +#: authentication/api/password.py:31 terminal/api/session.py:224 +#: users/views/profile/reset.py:44 msgid "User does not exist: {}" msgstr "ユーザーが存在しない: {}" @@ -1695,7 +1695,7 @@ msgstr "" "ユーザーは {}からです。対応するシステムにアクセスしてパスワードを変更してくだ" "さい。" -#: authentication/api/password.py:54 +#: authentication/api/password.py:59 #: authentication/templates/authentication/login.html:256 #: users/templates/users/forgot_password.html:27 #: users/templates/users/forgot_password.html:28 @@ -2019,9 +2019,8 @@ msgstr "メッセージ検証コードが無効" #: authentication/mfa/sms.py:12 authentication/serializers/password_mfa.py:16 #: authentication/serializers/password_mfa.py:24 #: settings/serializers/auth/sms.py:27 users/forms/profile.py:103 -#: users/forms/profile.py:106 users/templates/users/forgot_password.html:61 -#: users/templates/users/forgot_password.html:111 -#: users/views/profile/reset.py:75 +#: users/forms/profile.py:106 users/templates/users/forgot_password.html:111 +#: users/views/profile/reset.py:74 msgid "SMS" msgstr "メッセージ" @@ -2159,7 +2158,6 @@ msgstr "アセットまたはアプリが必要" #: notifications/backends/__init__.py:10 settings/serializers/email.py:19 #: settings/serializers/email.py:50 users/forms/profile.py:102 #: users/forms/profile.py:106 users/models/user.py:675 -#: users/templates/users/forgot_password.html:57 #: users/templates/users/forgot_password.html:116 #: users/views/profile/reset.py:68 msgid "Email" @@ -4778,7 +4776,6 @@ msgstr "" " " #: templates/_mfa_login_field.html:28 -#: users/templates/users/forgot_password.html:68 msgid "Send verification code" msgstr "確認コードを送信" @@ -5904,7 +5901,7 @@ msgstr "ユーザーパスワード履歴" msgid "Reset password" msgstr "パスワードのリセット" -#: users/notifications.py:85 users/views/profile/reset.py:184 +#: users/notifications.py:85 users/views/profile/reset.py:189 msgid "Reset password success" msgstr "パスワードのリセット成功" @@ -6097,9 +6094,26 @@ msgid "click here to set your password" msgstr "ここをクリックしてパスワードを設定してください" #: users/templates/users/forgot_password.html:32 -msgid "Input your email, that will send a mail to your" +msgid "Input your email account, that will send a email to your" msgstr "あなたのメールを入力し、それはあなたにメールを送信します" +#: users/templates/users/forgot_password.html:35 +msgid "" +"Enter your mobile number and a verification code will be sent to your phone" +msgstr "" + +#: users/templates/users/forgot_password.html:57 +msgid "Email account" +msgstr "アカウント" + +#: users/templates/users/forgot_password.html:61 +msgid "Mobile number" +msgstr "シリアル番号" + +#: users/templates/users/forgot_password.html:68 +msgid "Send" +msgstr "ユーザーを送信" + #: users/templates/users/forgot_password.html:72 #: users/templates/users/forgot_password_previewing.html:30 msgid "Submit" @@ -6251,23 +6265,23 @@ msgstr "OTP無効化成功、ログインページを返す" msgid "Password invalid" msgstr "パスワード無効" -#: users/views/profile/reset.py:141 users/views/profile/reset.py:152 +#: users/views/profile/reset.py:144 users/views/profile/reset.py:155 msgid "Token invalid or expired" msgstr "トークンが無効または期限切れ" -#: users/views/profile/reset.py:157 +#: users/views/profile/reset.py:160 msgid "User auth from {}, go there change password" msgstr "ユーザー認証ソース {}, 対応するシステムにパスワードを変更してください" -#: users/views/profile/reset.py:164 +#: users/views/profile/reset.py:167 msgid "* Your password does not meet the requirements" msgstr "* パスワードが要件を満たしていない" -#: users/views/profile/reset.py:170 +#: users/views/profile/reset.py:173 msgid "* The new password cannot be the last {} passwords" msgstr "* 新しいパスワードを最後の {} パスワードにすることはできません" -#: users/views/profile/reset.py:185 +#: users/views/profile/reset.py:190 msgid "Reset password success, return to login page" msgstr "パスワードの成功をリセットし、ログインページに戻る" diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 51e40357d..3b4c0a0d2 100644 --- a/apps/locale/zh/LC_MESSAGES/django.mo +++ b/apps/locale/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd5b2c234f9f4e545b3b95459c26aa729ce30e261f09c49446b0cf4261709343 -size 108827 +oid sha256:a77697e0f3332c8679c554fdbd1579b2337cc641a7e42cca2c039360c9056d95 +size 108944 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index e4b885939..c42f82c85 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-15 16:44+0800\n" +"POT-Creation-Date: 2022-11-15 18:06+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -1666,8 +1666,8 @@ msgstr "此操作需要验证您的 MFA" msgid "Current user not support mfa type: {}" msgstr "当前用户不支持 MFA 类型: {}" -#: authentication/api/password.py:30 terminal/api/session.py:224 -#: users/views/profile/reset.py:45 users/views/profile/reset.py:119 +#: authentication/api/password.py:31 terminal/api/session.py:224 +#: users/views/profile/reset.py:44 msgid "User does not exist: {}" msgstr "用户不存在: {}" @@ -1681,7 +1681,7 @@ msgid "" "password" msgstr "用户来自 {} 请去相应系统修改密码" -#: authentication/api/password.py:54 +#: authentication/api/password.py:59 #: authentication/templates/authentication/login.html:256 #: users/templates/users/forgot_password.html:27 #: users/templates/users/forgot_password.html:28 @@ -1995,9 +1995,8 @@ msgstr "短信验证码校验失败" #: authentication/mfa/sms.py:12 authentication/serializers/password_mfa.py:16 #: authentication/serializers/password_mfa.py:24 #: settings/serializers/auth/sms.py:27 users/forms/profile.py:103 -#: users/forms/profile.py:106 users/templates/users/forgot_password.html:61 -#: users/templates/users/forgot_password.html:111 -#: users/views/profile/reset.py:75 +#: users/forms/profile.py:106 users/templates/users/forgot_password.html:111 +#: users/views/profile/reset.py:74 msgid "SMS" msgstr "短信" @@ -2131,7 +2130,6 @@ msgstr "资产或应用必填" #: notifications/backends/__init__.py:10 settings/serializers/email.py:19 #: settings/serializers/email.py:50 users/forms/profile.py:102 #: users/forms/profile.py:106 users/models/user.py:675 -#: users/templates/users/forgot_password.html:57 #: users/templates/users/forgot_password.html:116 #: users/views/profile/reset.py:68 msgid "Email" @@ -2142,11 +2140,6 @@ msgstr "邮箱" msgid "The {} cannot be empty" msgstr "{} 不能为空" -#: authentication/serializers/password_mfa.py:29 -#: users/templates/users/forgot_password.html:107 -msgid "The {} cannot be empty" -msgstr "{} 不能为空" - #: authentication/serializers/token.py:79 #: perms/serializers/application/permission.py:20 #: perms/serializers/application/permission.py:41 @@ -4706,7 +4699,6 @@ msgstr "" " " #: templates/_mfa_login_field.html:28 -#: users/templates/users/forgot_password.html:68 msgid "Send verification code" msgstr "发送验证码" @@ -5816,7 +5808,7 @@ msgstr "用户密码历史" msgid "Reset password" msgstr "重置密码" -#: users/notifications.py:85 users/views/profile/reset.py:184 +#: users/notifications.py:85 users/views/profile/reset.py:189 msgid "Reset password success" msgstr "重置密码成功" @@ -6007,9 +5999,26 @@ msgid "click here to set your password" msgstr "点击这里设置密码" #: users/templates/users/forgot_password.html:32 -msgid "Input your email, that will send a mail to your" +msgid "Input your email account, that will send a email to your" msgstr "输入您的邮箱, 将会发一封重置邮件到您的邮箱中" +#: users/templates/users/forgot_password.html:35 +msgid "" +"Enter your mobile number and a verification code will be sent to your phone" +msgstr "" + +#: users/templates/users/forgot_password.html:57 +msgid "Email account" +msgstr "账号" + +#: users/templates/users/forgot_password.html:61 +msgid "Mobile number" +msgstr "序列号" + +#: users/templates/users/forgot_password.html:68 +msgid "Send" +msgstr "发件人" + #: users/templates/users/forgot_password.html:72 #: users/templates/users/forgot_password_previewing.html:30 msgid "Submit" @@ -6153,23 +6162,23 @@ msgstr "MFA(OTP) 禁用成功，返回登录页面" msgid "Password invalid" msgstr "用户名或密码无效" -#: users/views/profile/reset.py:141 users/views/profile/reset.py:152 +#: users/views/profile/reset.py:144 users/views/profile/reset.py:155 msgid "Token invalid or expired" msgstr "Token错误或失效" -#: users/views/profile/reset.py:157 +#: users/views/profile/reset.py:160 msgid "User auth from {}, go there change password" msgstr "用户认证源来自 {}, 请去相应系统修改密码" -#: users/views/profile/reset.py:164 +#: users/views/profile/reset.py:167 msgid "* Your password does not meet the requirements" msgstr "* 您的密码不符合要求" -#: users/views/profile/reset.py:170 +#: users/views/profile/reset.py:173 msgid "* The new password cannot be the last {} passwords" msgstr "* 新密码不能是最近 {} 次的密码" -#: users/views/profile/reset.py:185 +#: users/views/profile/reset.py:190 msgid "Reset password success, return to login page" msgstr "重置密码成功，返回到登录页面"