Move macaron to chi (#14293)
Use [chi](https://github.com/go-chi/chi) instead of the forked [macaron](https://gitea.com/macaron/macaron). Since macaron and chi have conflicts with session share, this big PR becomes a have-to thing. According my previous idea, we can replace macaron step by step but I'm wrong. :( Below is a list of big changes on this PR. - [x] Define `context.ResponseWriter` interface with an implementation `context.Response`. - [x] Use chi instead of macaron, and also a customize `Route` to wrap chi so that the router usage is similar as before. - [x] Create different routers for `web`, `api`, `internal` and `install` so that the codes will be more clear and no magic . - [x] Use https://github.com/unrolled/render instead of macaron's internal render - [x] Use https://github.com/NYTimes/gziphandler instead of https://gitea.com/macaron/gzip - [x] Use https://gitea.com/go-chi/session which is a modified version of https://gitea.com/macaron/session and removed `nodb` support since it will not be maintained. **BREAK** - [x] Use https://gitea.com/go-chi/captcha which is a modified version of https://gitea.com/macaron/captcha - [x] Use https://gitea.com/go-chi/cache which is a modified version of https://gitea.com/macaron/cache - [x] Use https://gitea.com/go-chi/binding which is a modified version of https://gitea.com/macaron/binding - [x] Use https://github.com/go-chi/cors instead of https://gitea.com/macaron/cors - [x] Dropped https://gitea.com/macaron/i18n and make a new one in `code.gitea.io/gitea/modules/translation` - [x] Move validation form structs from `code.gitea.io/gitea/modules/auth` to `code.gitea.io/gitea/modules/forms` to avoid dependency cycle. - [x] Removed macaron log service because it's not need any more. **BREAK** - [x] All form structs have to be get by `web.GetForm(ctx)` in the route function but not as a function parameter on routes definition. - [x] Move Git HTTP protocol implementation to use routers directly. - [x] Fix the problem that chi routes don't support trailing slash but macaron did. - [x] `/api/v1/swagger` now will be redirect to `/api/swagger` but not render directly so that `APIContext` will not create a html render. Notices: - Chi router don't support request with trailing slash - Integration test `TestUserHeatmap` maybe mysql version related. It's failed on my macOS(mysql 5.7.29 installed via brew) but succeed on CI. Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
parent
3adbbb4255
commit
6433ba0ec3
353 changed files with 5463 additions and 20785 deletions
|
@ -9,7 +9,6 @@ import (
|
|||
"code.gitea.io/gitea/modules/options"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
|
||||
macaron_i18n "gitea.com/macaron/i18n"
|
||||
"github.com/unknwon/i18n"
|
||||
"golang.org/x/text/language"
|
||||
)
|
||||
|
@ -20,49 +19,57 @@ type Locale interface {
|
|||
Tr(string, ...interface{}) string
|
||||
}
|
||||
|
||||
// LangType represents a lang type
|
||||
type LangType struct {
|
||||
Lang, Name string
|
||||
}
|
||||
|
||||
var (
|
||||
matcher language.Matcher
|
||||
matcher language.Matcher
|
||||
allLangs []LangType
|
||||
)
|
||||
|
||||
// AllLangs returns all supported langauages
|
||||
func AllLangs() []LangType {
|
||||
return allLangs
|
||||
}
|
||||
|
||||
// InitLocales loads the locales
|
||||
func InitLocales() {
|
||||
localeNames, err := options.Dir("locale")
|
||||
|
||||
if err != nil {
|
||||
log.Fatal("Failed to list locale files: %v", err)
|
||||
}
|
||||
localFiles := make(map[string][]byte)
|
||||
|
||||
localFiles := make(map[string][]byte)
|
||||
for _, name := range localeNames {
|
||||
localFiles[name], err = options.Locale(name)
|
||||
|
||||
if err != nil {
|
||||
log.Fatal("Failed to load %s locale file. %v", name, err)
|
||||
}
|
||||
}
|
||||
|
||||
// These codes will be used once macaron removed
|
||||
/*tags := make([]language.Tag, len(setting.Langs))
|
||||
tags := make([]language.Tag, len(setting.Langs))
|
||||
for i, lang := range setting.Langs {
|
||||
tags[i] = language.Raw.Make(lang)
|
||||
}
|
||||
matcher = language.NewMatcher(tags)
|
||||
for i, name := range setting.Names {
|
||||
i18n.SetMessage(setting.Langs[i], localFiles[name])
|
||||
}
|
||||
i18n.SetDefaultLang("en-US")*/
|
||||
|
||||
// To be compatible with macaron, we now have to use macaron i18n, once macaron
|
||||
// removed, we can use i18n directly
|
||||
macaron_i18n.I18n(macaron_i18n.Options{
|
||||
SubURL: setting.AppSubURL,
|
||||
Files: localFiles,
|
||||
Langs: setting.Langs,
|
||||
Names: setting.Names,
|
||||
DefaultLang: "en-US",
|
||||
Redirect: false,
|
||||
CookieDomain: setting.SessionConfig.Domain,
|
||||
})
|
||||
matcher = language.NewMatcher(tags)
|
||||
for i := range setting.Names {
|
||||
key := "locale_" + setting.Langs[i] + ".ini"
|
||||
if err := i18n.SetMessageWithDesc(setting.Langs[i], setting.Names[i], localFiles[key]); err != nil {
|
||||
log.Fatal("Failed to set messages to %s: %v", setting.Langs[i], err)
|
||||
}
|
||||
}
|
||||
i18n.SetDefaultLang("en-US")
|
||||
|
||||
allLangs = make([]LangType, 0, i18n.Count()-1)
|
||||
langs := i18n.ListLangs()
|
||||
names := i18n.ListLangDescs()
|
||||
for i, v := range langs {
|
||||
allLangs = append(allLangs, LangType{v, names[i]})
|
||||
}
|
||||
}
|
||||
|
||||
// Match matches accept languages
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue