Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use correct translation key for errors (#18342) 

- Noted by:
https://github.com/go-gitea/gitea/issues/17876#issuecomment-1017503614
This commit is contained in:
Gusted 2022-01-20 16:18:46 +01:00 committed by GitHub
parent 5bf8d5445e
commit 16d378fefc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
routers/web/org/setting.go
View File

@ -74,10 +74,14 @@ func SettingsPost(ctx *context.Context) {
ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), tplSettingsOptions, &form) ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), tplSettingsOptions, &form)
return return
} else if err = user_model.ChangeUserName(org.AsUser(), form.Name); err != nil { } else if err = user_model.ChangeUserName(org.AsUser(), form.Name); err != nil {
if db.IsErrNameReserved(err) || db.IsErrNamePatternNotAllowed(err) { switch {
case db.IsErrNameReserved(err):
ctx.Data["OrgName"] = true ctx.Data["OrgName"] = true
ctx.RenderWithErr(ctx.Tr("form.illegal_username"), tplSettingsOptions, &form) ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(db.ErrNameReserved).Name), tplSettingsOptions, &form)
} else { case db.IsErrNamePatternNotAllowed(err):
ctx.Data["OrgName"] = true
ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(db.ErrNamePatternNotAllowed).Pattern), tplSettingsOptions, &form)
default:
ctx.ServerError("ChangeUserName", err) ctx.ServerError("ChangeUserName", err)
} }
return return