diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-02-15 05:48:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-14 21:48:45 +0000 |
| commit | f3eb835886031df7a562abc123c3f6011c81eca8 (patch) | |
| tree | 6db218680b00a81f2ea46675d5dde94642a232b9 /modules/auth | |
| parent | 94d06be035bac468129903c9f32e785baf3c1c3b (diff) | |
| download | gitea-f3eb835886031df7a562abc123c3f6011c81eca8.tar.gz gitea-f3eb835886031df7a562abc123c3f6011c81eca8.zip | |
Refactor locale&string&template related code (#29165)
Clarify when "string" should be used (and be escaped), and when
"template.HTML" should be used (no need to escape)
And help PRs like #29059 , to render the error messages correctly.
Diffstat (limited to 'modules/auth')
| -rw-r--r-- | modules/auth/password/password.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/auth/password/password.go b/modules/auth/password/password.go index 2c7205b708..27074358a9 100644 --- a/modules/auth/password/password.go +++ b/modules/auth/password/password.go @@ -8,6 +8,7 @@ import ( "context" "crypto/rand" "errors" + "html/template" "math/big" "strings" "sync" @@ -121,15 +122,15 @@ func Generate(n int) (string, error) { } // BuildComplexityError builds the error message when password complexity checks fail -func BuildComplexityError(locale translation.Locale) string { +func BuildComplexityError(locale translation.Locale) template.HTML { var buffer bytes.Buffer - buffer.WriteString(locale.Tr("form.password_complexity")) + buffer.WriteString(locale.TrString("form.password_complexity")) buffer.WriteString("<ul>") for _, c := range requiredList { buffer.WriteString("<li>") - buffer.WriteString(locale.Tr(c.TrNameOne)) + buffer.WriteString(locale.TrString(c.TrNameOne)) buffer.WriteString("</li>") } buffer.WriteString("</ul>") - return buffer.String() + return template.HTML(buffer.String()) } |