- Backport #18135 - Backport #18153tags/v1.15.10
@@ -77,7 +77,14 @@ func handleMigrateError(ctx *context.Context, owner *models.User, err error, nam | |||
case migrations.IsTwoFactorAuthError(err): | |||
ctx.RenderWithErr(ctx.Tr("form.2fa_auth_required"), tpl, form) | |||
case models.IsErrReachLimitOfRepo(err): | |||
ctx.RenderWithErr(ctx.Tr("repo.form.reach_limit_of_creation", owner.MaxCreationLimit()), tpl, form) | |||
var msg string | |||
maxCreationLimit := owner.MaxCreationLimit() | |||
if maxCreationLimit == 1 { | |||
msg = ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit) | |||
} else { | |||
msg = ctx.Tr("repo.form.reach_limit_of_creation_n", maxCreationLimit) | |||
} | |||
ctx.RenderWithErr(msg, tpl, form) | |||
case models.IsErrRepoAlreadyExist(err): | |||
ctx.Data["Err_RepoName"] = true | |||
ctx.RenderWithErr(ctx.Tr("form.repo_name_been_taken"), tpl, form) |
@@ -158,7 +158,14 @@ func Create(ctx *context.Context) { | |||
func handleCreateError(ctx *context.Context, owner *models.User, err error, name string, tpl base.TplName, form interface{}) { | |||
switch { | |||
case models.IsErrReachLimitOfRepo(err): | |||
ctx.RenderWithErr(ctx.Tr("repo.form.reach_limit_of_creation", owner.MaxCreationLimit()), tpl, form) | |||
var msg string | |||
maxCreationLimit := owner.MaxCreationLimit() | |||
if maxCreationLimit == 1 { | |||
msg = ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit) | |||
} else { | |||
msg = ctx.Tr("repo.form.reach_limit_of_creation_n", maxCreationLimit) | |||
} | |||
ctx.RenderWithErr(msg, tpl, form) | |||
case models.IsErrRepoAlreadyExist(err): | |||
ctx.Data["Err_RepoName"] = true | |||
ctx.RenderWithErr(ctx.Tr("form.repo_name_been_taken"), tpl, form) |
@@ -533,7 +533,12 @@ func SettingsPost(ctx *context.Context) { | |||
} | |||
if !ctx.Repo.Owner.CanCreateRepo() { | |||
ctx.Flash.Error(ctx.Tr("repo.form.reach_limit_of_creation", ctx.User.MaxCreationLimit())) | |||
maxCreationLimit := ctx.Repo.Owner.MaxCreationLimit() | |||
if maxCreationLimit == 1 { | |||
ctx.Flash.Error(ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit)) | |||
} else { | |||
ctx.Flash.Error(ctx.Tr("repo.form.reach_limit_of_creation_n", maxCreationLimit)) | |||
} | |||
ctx.Redirect(repo.Link() + "/settings") | |||
return | |||
} |