diff --git a/apps/authentication/backends/oidc/views.py b/apps/authentication/backends/oidc/views.py index 117c46c56..6d3df51a4 100644 --- a/apps/authentication/backends/oidc/views.py +++ b/apps/authentication/backends/oidc/views.py @@ -172,7 +172,7 @@ class OIDCAuthCallbackView(View, FlashMessageMixin): user = auth.authenticate(nonce=nonce, request=request, code_verifier=code_verifier) except IntegrityError: title = _("OpenID Error") - msg = _('Username or email already exists, Please check') + msg = _('Please check if a user with the same username or email already exists') response = self.get_failed_response('/', title, msg) return response if user: diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index fba291bfa..2122b2a80 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/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: 2024-09-02 10:59+0800\n" +"POT-Creation-Date: 2024-09-06 10:29+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2630,7 +2630,7 @@ msgstr "終了" #: audits/const.py:46 settings/serializers/terminal.py:6 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:175 #: terminal/models/virtualapp/provider.py:14 terminal/serializers/session.py:55 -#: terminal/serializers/session.py:69 +#: terminal/serializers/session.py:78 msgid "Terminal" msgstr "ターミナル" @@ -2985,8 +2985,8 @@ msgid "OpenID Error" msgstr "OpenID エラー" #: authentication/backends/oidc/views.py:175 -msgid "Username or email already exists, Please check" -msgstr "ユーザー名またはメールアドレスが既に存在しています。ご確認ください" +msgid "Please check if a user with the same username or email already exists" +msgstr "同じユーザー名またはメールアドレスのユーザーが既に存在するかどうかを確認してください" #: authentication/backends/passkey/api.py:37 msgid "Only register passkey for local user" @@ -7463,7 +7463,7 @@ msgstr "ログイン元" msgid "Replay" msgstr "リプレイ" -#: terminal/models/session/session.py:48 terminal/serializers/session.py:68 +#: terminal/models/session/session.py:48 terminal/serializers/session.py:77 msgid "Command amount" msgstr "コマンド量" @@ -8892,7 +8892,7 @@ msgstr "" msgid "name not unique" msgstr "名前が一意ではない" -#: users/signal_handlers.py:39 +#: users/signal_handlers.py:41 msgid "" "The administrator has enabled \"Only allow existing users to log in\", \n" " and the current user is not in the user list. Please contact the " @@ -8901,7 +8901,7 @@ msgstr "" "管理者は「既存のユーザーのみログインを許可」をオンにしており、現在のユーザー" "はユーザーリストにありません。管理者に連絡してください。" -#: users/signal_handlers.py:183 +#: users/signal_handlers.py:193 msgid "Clean up expired user sessions" msgstr "期限切れのユーザー・セッションのパージ" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 385f7d7d2..ac1f04910 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/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: 2024-09-02 10:59+0800\n" +"POT-Creation-Date: 2024-09-06 10:29+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -2602,7 +2602,7 @@ msgstr "结束" #: audits/const.py:46 settings/serializers/terminal.py:6 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:175 #: terminal/models/virtualapp/provider.py:14 terminal/serializers/session.py:55 -#: terminal/serializers/session.py:69 +#: terminal/serializers/session.py:78 msgid "Terminal" msgstr "终端" @@ -2952,8 +2952,8 @@ msgid "OpenID Error" msgstr "OpenID 错误" #: authentication/backends/oidc/views.py:175 -msgid "Username or email already exists, Please check" -msgstr "用户名或者邮箱已经存在，请检查" +msgid "Please check if a user with the same username or email already exists" +msgstr "请检查是否已经存在相同用户名或邮箱的用户" #: authentication/backends/passkey/api.py:37 msgid "Only register passkey for local user" @@ -7322,7 +7322,7 @@ msgstr "登录来源" msgid "Replay" msgstr "回放" -#: terminal/models/session/session.py:48 terminal/serializers/session.py:68 +#: terminal/models/session/session.py:48 terminal/serializers/session.py:77 msgid "Command amount" msgstr "命令数量" @@ -8723,7 +8723,7 @@ msgstr "* 为安全起见，只显示部分用户。您可以搜索更多" msgid "name not unique" msgstr "名称重复" -#: users/signal_handlers.py:39 +#: users/signal_handlers.py:41 msgid "" "The administrator has enabled \"Only allow existing users to log in\", \n" " and the current user is not in the user list. Please contact the " @@ -8731,7 +8731,7 @@ msgid "" msgstr "" "管理员已开启'仅允许已存在用户登录'，当前用户不在用户列表中，请联系管理员。" -#: users/signal_handlers.py:183 +#: users/signal_handlers.py:193 msgid "Clean up expired user sessions" msgstr "清除过期的用户会话" diff --git a/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po b/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po index d13397912..5a9357fda 100644 --- a/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh_Hant/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: 2024-09-02 10:59+0800\n" +"POT-Creation-Date: 2024-09-06 10:29+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -2603,7 +2603,7 @@ msgstr "結束" #: audits/const.py:46 settings/serializers/terminal.py:6 #: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:175 #: terminal/models/virtualapp/provider.py:14 terminal/serializers/session.py:55 -#: terminal/serializers/session.py:69 +#: terminal/serializers/session.py:78 msgid "Terminal" msgstr "終端" @@ -2953,8 +2953,8 @@ msgid "OpenID Error" msgstr "OpenID 錯誤" #: authentication/backends/oidc/views.py:175 -msgid "Username or email already exists, Please check" -msgstr "使用者名稱或者電子郵件已經存在，請檢查" +msgid "Please check if a user with the same username or email already exists" +msgstr "請檢查是否已經存在相同用戶名或電子郵箱的用戶" #: authentication/backends/passkey/api.py:37 msgid "Only register passkey for local user" @@ -7324,7 +7324,7 @@ msgstr "登錄來源" msgid "Replay" msgstr "重播" -#: terminal/models/session/session.py:48 terminal/serializers/session.py:68 +#: terminal/models/session/session.py:48 terminal/serializers/session.py:77 msgid "Command amount" msgstr "命令數量" @@ -8732,7 +8732,7 @@ msgstr "" msgid "name not unique" msgstr "名稱重複" -#: users/signal_handlers.py:39 +#: users/signal_handlers.py:41 msgid "" "The administrator has enabled \"Only allow existing users to log in\", \n" " and the current user is not in the user list. Please contact the " @@ -8740,7 +8740,7 @@ msgid "" msgstr "" "管理員已開啟'僅允許已存在用戶登錄'，當前用戶不在用戶列表中，請聯絡管理員。" -#: users/signal_handlers.py:183 +#: users/signal_handlers.py:193 msgid "Clean up expired user sessions" msgstr "清除過期的用戶會話"