0
0
mirror of https://github.com/go-gitea/gitea.git synced 2026-06-13 06:48:40 +02:00

Fixes related to prior merge

This commit is contained in:
DmitryFrolovTri 2024-02-28 12:12:33 +00:00
parent 0fee4f4083
commit ecdc2a7962
No known key found for this signature in database
GPG Key ID: 0FBA4D49377CDDC3
4 changed files with 5 additions and 6 deletions

View File

@ -3187,8 +3187,8 @@ config.open_with_editor_app_help = The "Open with" editors for the clone menu. I
config.repository_config = Repository Configuration
config.enable_size_limit = Enable Size Limit
config.repo_size_limit = Default Repository Size Limit
config.invalid_repo_size = Invalid repository size.
config.save_repo_size_setting_failed = Failed to save global repository settings
config.invalid_repo_size = Invalid repository size %s
config.save_repo_size_setting_failed = Failed to save global repository settings %s
config.repository_setting_success = Global repository setting has been updated
config.git_config = Git Configuration

View File

@ -76,7 +76,6 @@ func UpdateRepoPost(ctx *context.Context) {
}
err = setting.SaveGlobalRepositorySetting(form.EnableSizeLimit, repoSizeLimit)
if err != nil {
ctx.Data["Err_Repo_Size_Save"] = err.Error()
explore.RenderRepoSearch(ctx, &explore.RepoSearchOptions{

View File

@ -7,7 +7,7 @@ import (
"testing"
"code.gitea.io/gitea/models/unittest"
"code.gitea.io/gitea/modules/contexttest"
"code.gitea.io/gitea/services/contexttest"
"github.com/stretchr/testify/assert"
)

View File

@ -155,13 +155,13 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
ctx.Data["Page"] = pager
if ctx.Data["Err_Repo_Size_Limit"] != nil {
ctx.RenderWithErr(ctx.Tr("admin.config.invalid_repo_size")+" "+ctx.Data["Err_Repo_Size_Limit"].(string),
ctx.RenderWithErr(ctx.Tr("admin.config.invalid_repo_size", ctx.Data["Err_Repo_Size_Limit"].(string)),
opts.TplName, nil)
return
}
if ctx.Data["Err_Repo_Size_Save"] != nil {
ctx.RenderWithErr(ctx.Tr("admin.config.save_repo_size_setting_failed")+" "+ctx.Data["Err_Repo_Size_Save"].(string),
ctx.RenderWithErr(ctx.Tr("admin.config.save_repo_size_setting_failed", ctx.Data["Err_Repo_Size_Save"].(string)),
opts.TplName, nil)
return
}