Skip to content

Commit 16d378f

Browse files
author
Gusted
authored
Use correct translation key for errors (#18342)
- Noted by: #17876 (comment)
1 parent 5bf8d54 commit 16d378f

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

routers/web/org/setting.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,14 @@ func SettingsPost(ctx *context.Context) {
7474
ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), tplSettingsOptions, &form)
7575
return
7676
} else if err = user_model.ChangeUserName(org.AsUser(), form.Name); err != nil {
77-
if db.IsErrNameReserved(err) || db.IsErrNamePatternNotAllowed(err) {
77+
switch {
78+
case db.IsErrNameReserved(err):
7879
ctx.Data["OrgName"] = true
79-
ctx.RenderWithErr(ctx.Tr("form.illegal_username"), tplSettingsOptions, &form)
80-
} else {
80+
ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(db.ErrNameReserved).Name), tplSettingsOptions, &form)
81+
case db.IsErrNamePatternNotAllowed(err):
82+
ctx.Data["OrgName"] = true
83+
ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(db.ErrNamePatternNotAllowed).Pattern), tplSettingsOptions, &form)
84+
default:
8185
ctx.ServerError("ChangeUserName", err)
8286
}
8387
return

0 commit comments

Comments
 (0)