-
-
Notifications
You must be signed in to change notification settings - Fork 9.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add globalInfo into templates model (#6823)
#### What type of PR is this? /kind improvement /area core /milestone 2.20.x #### What this PR does / why we need it: This PR adds globalInfo into template models and refactors password reset to adapt data binding. Fixes #6821 #### Does this PR introduce a user-facing change? ```release-note None ```
- Loading branch information
Showing
12 changed files
with
174 additions
and
137 deletions.
There are no files selected for viewing
258 changes: 136 additions & 122 deletions
258
...cation/src/main/java/run/halo/app/security/preauth/PreAuthEmailPasswordResetEndpoint.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...tion/src/main/resources/templates/gateway_fragments/password_reset_email_reset.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
form.password.label=密码 | ||
form.confirmPassword.label=确认密码 | ||
form.password.tips=密码只能使用大小写字母 (A-Z, a-z)、数字 (0-9),以及以下特殊字符: !@#$%^&*。 | ||
form.submit=修改密码 | ||
form.submit=修改密码 | ||
error.rate_limit_exceeded=您的请求过于频繁,请稍后再试。 |
3 changes: 2 additions & 1 deletion
3
...n/src/main/resources/templates/gateway_fragments/password_reset_email_reset_en.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
form.password.label=Password | ||
form.confirmPassword.label=Confirm Password | ||
form.password.tips=The password can only use uppercase and lowercase letters (A-Z, a-z), numbers (0-9), and the following special characters: !@#$%^&* | ||
form.submit=Change password | ||
form.submit=Change password | ||
error.rate_limit_exceeded=Your request is too frequent, please try again later. |
3 changes: 2 additions & 1 deletion
3
...n/src/main/resources/templates/gateway_fragments/password_reset_email_reset_es.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
form.password.label=Contraseña | ||
form.confirmPassword.label=Confirmar Contraseña | ||
form.password.tips=La contraseña solo puede usar letras mayúsculas y minúsculas (A-Z, a-z), números (0-9) y los siguientes caracteres especiales: !@#$%^&*. | ||
form.submit=Cambiar Contraseña | ||
form.submit=Cambiar Contraseña | ||
error.rate_limit_exceeded=Su solicitud es demasiado frecuente, por favor intente nuevamente más tarde. |
3 changes: 2 additions & 1 deletion
3
...rc/main/resources/templates/gateway_fragments/password_reset_email_reset_zh_TW.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
form.password.label=密碼 | ||
form.confirmPassword.label=確認密碼 | ||
form.password.tips=密碼只能使用大小寫字母 (A-Z, a-z)、數字 (0-9),以及以下特殊字符: !@#$%^&*。 | ||
form.submit=修改密碼 | ||
form.submit=修改密碼 | ||
error.rate_limit_exceeded=您的請求過於頻繁,請稍後再試。 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...ation/src/main/resources/templates/gateway_fragments/password_reset_email_send.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
form.email.label=电子邮箱 | ||
form.submit=提交 | ||
form.sent.submit=返回到登录页面 | ||
form.message.success=检查您的电子邮件中是否有重置密码的链接。如果几分钟内没有出现,请检查您的垃圾邮件文件夹。 | ||
form.message.success=检查您的电子邮件中是否有重置密码的链接。如果几分钟内没有出现,请检查您的垃圾邮件文件夹。 | ||
error.rate_limit_exceeded=您的请求速度太快。请稍后再试。 | ||
error.invalid_reset_token=重置密码令牌无效。请重试。 |
4 changes: 3 additions & 1 deletion
4
...on/src/main/resources/templates/gateway_fragments/password_reset_email_send_en.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
form.email.label=Email | ||
form.submit=Submit | ||
form.sent.submit=Return to login | ||
form.message.success=Check your email for a link to reset your password. If it doesn’t appear within a few minutes, check your spam folder. | ||
form.message.success=Check your email for a link to reset your password. If it doesn’t appear within a few minutes, check your spam folder. | ||
error.rate_limit_exceeded=You are making requests too quickly. Please try again later. | ||
error.invalid_reset_token=The reset password token is invalid. Please try again. |
4 changes: 3 additions & 1 deletion
4
...on/src/main/resources/templates/gateway_fragments/password_reset_email_send_es.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
form.email.label=Correo Electrónico | ||
form.submit=Enviar | ||
form.sent.submit=Volver a la Página de Inicio de Sesión | ||
form.message.success=Revisa tu correo electrónico para ver el enlace de restablecimiento de contraseña. Si no aparece en unos minutos, revisa tu carpeta de spam. | ||
form.message.success=Revisa tu correo electrónico para ver el enlace de restablecimiento de contraseña. Si no aparece en unos minutos, revisa tu carpeta de spam. | ||
error.rate_limit_exceeded=Se ha superado el límite de intentos de restablecimiento de contraseña. Por favor, inténtalo de nuevo más tarde. | ||
error.invalid_reset_token=El enlace de restablecimiento de contraseña no es válido o ha expirado. Por favor, solicita un nuevo enlace. |
4 changes: 3 additions & 1 deletion
4
...src/main/resources/templates/gateway_fragments/password_reset_email_send_zh_TW.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
form.email.label=電子郵件 | ||
form.submit=提交 | ||
form.sent.submit=返回到登入頁面 | ||
form.message.success=檢查您的電子郵件中是否有重置密碼的連結。如果幾分鐘內沒有出現,請檢查您的垃圾郵件資料夾。 | ||
form.message.success=檢查您的電子郵件中是否有重置密碼的連結。如果幾分鐘內沒有出現,請檢查您的垃圾郵件資料夾。 | ||
error.rate_limit_exceeded=您的請求過於頻繁。請稍後再試。 | ||
error.invalid_reset_token=重置密碼連結無效。請重試。 |