domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Replace interface{} with any (#25686) (#25687)

Browse source 
Same perl replacement as https://github.com/go-gitea/gitea/pull/25686
but for 1.20 to ease future backporting.
This commit is contained in:
silverwind 2023-07-05 05:41:32 +02:00 • committed by GitHub
parent 4e310133f9
commit 24e64fe372
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
233 changed files with 729 additions and 729 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/translation/i18n/format.go
View file

@ -9,12 +9,12 @@ import (
)
// Format formats provided arguments for a given translated message
func Format(format string, args ...interface{}) (msg string, err error) {
func Format(format string, args ...any) (msg string, err error) {
if len(args) == 0 {
return format, nil
}
fmtArgs := make([]interface{}, 0, len(args))
fmtArgs := make([]any, 0, len(args))
for _, arg := range args {
val := reflect.ValueOf(arg)
if val.Kind() == reflect.Slice {

4
modules/translation/i18n/i18n.go
View file

@ -11,7 +11,7 @@ var DefaultLocales = NewLocaleStore()
type Locale interface {
// Tr translates a given key and arguments for a language
Tr(trKey string, trArgs ...interface{}) string
Tr(trKey string, trArgs ...any) string
// Has reports if a locale has a translation for a given key
Has(trKey string) bool
}
@ -21,7 +21,7 @@ type LocaleStore interface {
io.Closer
// Tr translates a given key and arguments for a language
Tr(lang, trKey string, trArgs ...interface{}) string
Tr(lang, trKey string, trArgs ...any) string
// Has reports if a locale has a translation for a given key
Has(lang, trKey string) bool
// SetDefaultLang sets the default language to fall back to

4
modules/translation/i18n/localestore.go
View file

@ -86,7 +86,7 @@ func (store *localeStore) SetDefaultLang(lang string) {
}
// Tr translates content to target language. fall back to default language.
func (store *localeStore) Tr(lang, trKey string, trArgs ...interface{}) string {
func (store *localeStore) Tr(lang, trKey string, trArgs ...any) string {
l, _ := store.Locale(lang)
return l.Tr(trKey, trArgs...)
@ -119,7 +119,7 @@ func (store *localeStore) Close() error {
}
// Tr translates content to locale language. fall back to default language.
func (l *locale) Tr(trKey string, trArgs ...interface{}) string {
func (l *locale) Tr(trKey string, trArgs ...any) string {
format := trKey
idx, ok := l.store.trKeyToIdxMap[trKey]

4
modules/translation/mock.go
View file

@ -14,11 +14,11 @@ func (l MockLocale) Language() string {
return "en"
}
func (l MockLocale) Tr(s string, _ ...interface{}) string {
func (l MockLocale) Tr(s string, _ ...any) string {
return s
}
func (l MockLocale) TrN(_cnt interface{}, key1, _keyN string, _args ...interface{}) string {
func (l MockLocale) TrN(_cnt any, key1, _keyN string, _args ...any) string {
return key1
}