From 0c9d03aafb9e2181e47f837bab045263c67a8693 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 3 Jan 2025 01:38:31 +0800 Subject: [PATCH] fix merge --- routers/web/explore/code.go | 3 +-- routers/web/repo/search.go | 3 +-- routers/web/user/code.go | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index 25a34abbc46fc..3fca36c9abaaf 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -11,7 +11,6 @@ import ( "code.gitea.io/gitea/modules/base" code_indexer "code.gitea.io/gitea/modules/indexer/code" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" "code.gitea.io/gitea/routers/common" "code.gitea.io/gitea/services/context" ) @@ -132,7 +131,7 @@ func Code(ctx *context.Context) { pager := context.NewPagination(total, setting.UI.RepoSearchPagingNum, page, 5) pager.SetDefaultParams(ctx) - pager.AddParamString("l", language) + pager.AddParamString("l", prepareSearch.Language) ctx.Data["Page"] = pager ctx.HTML(http.StatusOK, tplExploreCode) diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index 8da850632c57b..d5772ff79d2fa 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -12,7 +12,6 @@ import ( "code.gitea.io/gitea/modules/git" code_indexer "code.gitea.io/gitea/modules/indexer/code" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" "code.gitea.io/gitea/routers/common" "code.gitea.io/gitea/services/context" ) @@ -102,7 +101,7 @@ func Search(ctx *context.Context) { pager := context.NewPagination(total, setting.UI.RepoSearchPagingNum, page, 5) pager.SetDefaultParams(ctx) - pager.AddParamString("l", language) + pager.AddParamString("l", prepareSearch.Language) ctx.Data["Page"] = pager ctx.HTML(http.StatusOK, tplSearch) diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 9780500494f71..8f4b4b2d9ac7c 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -11,7 +11,6 @@ import ( "code.gitea.io/gitea/modules/base" code_indexer "code.gitea.io/gitea/modules/indexer/code" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/templates" "code.gitea.io/gitea/routers/common" shared_user "code.gitea.io/gitea/routers/web/shared/user" "code.gitea.io/gitea/services/context" @@ -115,7 +114,7 @@ func CodeSearch(ctx *context.Context) { pager := context.NewPagination(total, setting.UI.RepoSearchPagingNum, page, 5) pager.SetDefaultParams(ctx) - pager.AddParamString("l", language) + pager.AddParamString("l", prepareSearch.Language) ctx.Data["Page"] = pager ctx.HTML(http.StatusOK, tplUserCode)