Gitea-John71/Gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-04-05 14:48:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix various trivial problems (#36953)

Browse Source 
1. remove `TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY`
* it defaults to false and is unlikely to be useful for most users (see
#22130)
* with new git versions (>= 2.40), "merge-tree" is used,
"checkConflictsByTmpRepo" isn't called, the option does nothing.
2. fix fragile `db.Cell2Int64` (new: `CellToInt`)
3. allow more routes in maintenance mode (e.g.: captcha)
4. fix MockLocale html escaping to make it have the same behavior as
production locale
This commit is contained in:
wxiaoguang
2026-03-24 02:23:42 +08:00
committed by GitHub
parent 788200de9f
commit 4f9f0fc4b8
10 changed files with 97 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/setting/repository.go
View File

@@ -86,7 +86,6 @@ var (
DefaultMergeMessageOfficialApproversOnly bool
PopulateSquashCommentWithCommitMessages bool
AddCoCommitterTrailers bool
TestConflictingPatchesWithGitApply bool
RetargetChildrenOnMerge bool
DelayCheckForInactiveDays int
DefaultDeleteBranchAfterMerge bool
@@ -211,7 +210,6 @@ var (
DefaultMergeMessageOfficialApproversOnly bool
PopulateSquashCommentWithCommitMessages bool
AddCoCommitterTrailers bool
TestConflictingPatchesWithGitApply bool
RetargetChildrenOnMerge bool
DelayCheckForInactiveDays int
DefaultDeleteBranchAfterMerge bool

41
modules/translation/mock.go
View File

@@ -5,8 +5,8 @@ package translation
import (
"fmt"
"html"
"html/template"
"strings"
)
// MockLocale provides a mocked locale without any translations
@@ -20,25 +20,40 @@ func (l MockLocale) Language() string {
return "en"
}
func (l MockLocale) TrString(s string, args ...any) string {
return sprintAny(s, args...)
func (l MockLocale) TrString(format string, args ...any) (ret string) {
ret = format + ":"
for _, arg := range args {
// usually there is no arg or at most 1-2 args, so a simple string concatenation is more efficient
switch v := arg.(type) {
case string:
ret += v + ","
default:
ret += fmt.Sprint(v) + ","
}
}
return ret[:len(ret)-1]
}
func (l MockLocale) Tr(s string, args ...any) template.HTML {
return template.HTML(sprintAny(s, args...))
func (l MockLocale) Tr(format string, args ...any) (ret template.HTML) {
ret = template.HTML(html.EscapeString(format)) + ":"
for _, arg := range args {
// usually there is no arg or at most 1-2 args, so a simple string concatenation is more efficient
switch v := arg.(type) {
case template.HTML:
ret += v + ","
case string:
ret += template.HTML(html.EscapeString(v)) + ","
default:
ret += template.HTML(html.EscapeString(fmt.Sprint(v))) + ","
}
}
return ret[:len(ret)-1]
}
func (l MockLocale) TrN(cnt any, key1, keyN string, args ...any) template.HTML {
return template.HTML(sprintAny(key1, args...))
return l.Tr(key1, args...)
}
func (l MockLocale) PrettyNumber(v any) string {
return fmt.Sprint(v)
}
func sprintAny(s string, args ...any) string {
if len(args) == 0 {
return s
}
return s + ":" + fmt.Sprintf(strings.Repeat(",%v", len(args))[1:], args...)
}