Refactor i18n, use Locale to provide i18n/translation related functions #18648
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wxiaoguang
added
the
type/refactoring
KN4CK3R
reviewed
Feb 7, 2022
GiteaBot
added
the
lgtm/need 2
KN4CK3R
reviewed
Feb 7, 2022
KN4CK3R
reviewed
Feb 7, 2022
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
KN4CK3R
reviewed
Feb 7, 2022
| "AllLangs": translation.AllLangs(), | ||
| "CurrentURL": setting.AppSubURL + req.URL.RequestURI(), |
There was a problem hiding this comment.
Was this removal intended? There are still other places which set it and head_navbar.tmpl uses it.
There was a problem hiding this comment.
The install page do not need it, I have searched the code base.
There was a problem hiding this comment.
install.tmpl only includes head.tmpl, which says:
{{if not .PageIsInstall}}
<div class="ui top secondary stackable main menu following bar light">
{{template "base/head_navbar" .}}
</div><!-- end bar -->
{{end}}
singuliere
approved these changes
Feb 7, 2022
GiteaBot
added
lgtm/need 1
I have tested them, including issue activity pages, etc, screenshot shows no difference. |
KN4CK3R
approved these changes
Feb 7, 2022
GiteaBot
added
lgtm/done
zeripath
reviewed
Feb 7, 2022
| @@ -25,17 +25,18 @@ type Locale interface { | |||
|
|
|||
| // LangType represents a lang type | |||
| type LangType struct { | |||
There was a problem hiding this comment.
Maybe a crazy idea here but can't we unify this with type locale?
There was a problem hiding this comment.
It's feasible, and we could make a better locale struct.
In fact I had a plan to refactor all {{TimeSince .StartTime $.i18n.Lang}} to {{i18nUtil.TimeSince .StartTime}} to make code more simple and clear.
zeripath
approved these changes
Feb 7, 2022
Codecov Report
@@ Coverage Diff @@
## main #18648 +/- ##
==========================================
+ Coverage 46.31% 46.67% +0.36%
==========================================
Files 846 846
Lines 121244 121266 +22
==========================================
+ Hits 56155 56606 +451
+ Misses 58271 57790 -481
- Partials 6818 6870 +52
Continue to review full report at Codecov.
|
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Feb 8, 2022
* giteaofficial/main: (28 commits) Added auto-save whitespace behavior if it changed manually (go-gitea#15566) Support custom ACME provider (go-gitea#18340) Refactor i18n, use Locale to provide i18n/translation related functions (go-gitea#18648) Only request write when necessary (go-gitea#18657) [skip ci] Updated translations via Crowdin Add separate SSH_USER config option (go-gitea#17584) Be more lenient with label colors (go-gitea#17752) remove redundant call to UpdateRepoStats during migration (go-gitea#18591) more repo dump/restore tests, including pull requests (go-gitea#18621) No longer show the db-downgrade SQL in production (go-gitea#18653) Fix the missing i18n key for update checker (go-gitea#18646) Update gitea-vet (go-gitea#18640) Future proof for 1.18 (go-gitea#18644) Add `contrib/upgrade.sh` (go-gitea#18286) If rendering has failed due to a net.OpError stop rendering (go-gitea#18642) Delete old git.NewCommand() and use it as git.NewCommandContext() (go-gitea#18552) Update JS dependencies (go-gitea#18636) fix commits_list_small.tmpl (go-gitea#18641) Fix `make fmt` and `make fmt-check` (go-gitea#18633) Frontport of changelog for v1.16.1 (go-gitea#18615) ...
Chianina
pushed a commit
to Chianina/gitea
that referenced
this pull request
Mar 28, 2022
…ns (go-gitea#18648) * remove unnecessary web context data fields, and unify the i18n/translation related functions to `Locale` * in development, show an error if a translation key is missing * remove the unnecessary loops `for _, lang := range translation.AllLangs()` for every request, which improves the performance slightly * use `ctx.Locale.Language()` instead of `ctx.Data["Lang"].(string)` * add more comments about how the Locale/LangType fields are used
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR:
Localefor _, lang := range translation.AllLangs()for every request, which improves the performance slightlyctx.Locale.Language()instead ofctx.Data["Lang"].(string)