diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2022-04-03 17:46:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-03 17:46:48 +0800 |
| commit | d242511e86c3a6d8a7013100845d2cdc8eb5252c (patch) | |
| tree | 391b7fa946d32b44f06a274453e4b4d1a19fe8ee /modules/web/middleware | |
| parent | 27c34dd011cceb8232d1c3307f87b53a147c75c3 (diff) | |
| download | gitea-d242511e86c3a6d8a7013100845d2cdc8eb5252c.tar.gz gitea-d242511e86c3a6d8a7013100845d2cdc8eb5252c.zip | |
Remove legacy unmaintained packages, refactor to support change default locale (#19308)
Remove two unmaintained vendor packages `i18n` and `paginater`. Changes:
* Rewrite `i18n` package with a more clear fallback mechanism. Fix an unstable `Tr` behavior, add more tests.
* Refactor the legacy `Paginater` to `Paginator`, test cases are kept unchanged.
Trivial enhancement (no breaking for end users):
* Use the first locale in LANGS setting option as the default, add a log to prevent from surprising users.
Diffstat (limited to 'modules/web/middleware')
| -rw-r--r-- | modules/web/middleware/locale.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/web/middleware/locale.go b/modules/web/middleware/locale.go index 3daf5f32d4..de8e497965 100644 --- a/modules/web/middleware/locale.go +++ b/modules/web/middleware/locale.go @@ -9,8 +9,8 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/translation" + "code.gitea.io/gitea/modules/translation/i18n" - "github.com/unknwon/i18n" "golang.org/x/text/language" ) @@ -28,8 +28,8 @@ func Locale(resp http.ResponseWriter, req *http.Request) translation.Locale { } } - // Check again in case someone modify by purpose. - if lang != "" && !i18n.IsExist(lang) { + // Check again in case someone changes the supported language list. + if lang != "" && !i18n.DefaultLocales.HasLang(lang) { lang = "" changeLang = false } |