loading up the forgejo repo on tangled to test page performance
i18n: improve 'Verify' error message, stopgap for #2809 (#5479)
Signed-off-by: Adam Baxter <codeberg@voltagex.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5479
Reviewed-by: Otto <otto@codeberg.org>
Co-authored-by: voltagex <voltagex@noreply.codeberg.org>
Co-committed-by: voltagex <voltagex@noreply.codeberg.org>
+3
-1
+2
options/locale/locale_en-US.ini
+2
options/locale/locale_en-US.ini
···
438
438
password_too_short = Password length cannot be less than %d characters.
439
439
non_local_account = Non-local users cannot update their password through the Forgejo web interface.
440
440
verify = Verify
441
+
;As https://codeberg.org/forgejo/forgejo/issues/2809 progresses, please update this error message if possible
442
+
unauthorized_credentials = Credentials are incorrect or have expired. Retry your command or see %s for more information
441
443
scratch_code = Scratch code
442
444
use_scratch_code = Use a scratch code
443
445
twofa_scratch_used = You have used your scratch code. You have been redirected to the two-factor settings page so you may remove your device enrollment or generate a new scratch code.
+1
-1
routers/web/web.go
+1
-1
routers/web/web.go
···
122
122
ar, err := common.AuthShared(ctx.Base, ctx.Session, authMethod)
123
123
if err != nil {
124
124
log.Error("Failed to verify user: %v", err)
125
-
ctx.Error(http.StatusUnauthorized, "Verify")
125
+
ctx.Error(http.StatusUnauthorized, ctx.Locale.TrString("auth.unauthorized_credentials", "https://codeberg.org/forgejo/forgejo/issues/2809"))
126
126
return
127
127
}
128
128
ctx.Doer = ar.Doer