Clean up template locale usage #27856
Merged
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
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/M
wxiaoguang
added
the
type/refactoring
silverwind
approved these changes
Oct 31, 2023
GiteaBot
added
lgtm/need 1
denyskon
approved these changes
Oct 31, 2023
GiteaBot
added
lgtm/done
denyskon
added
the
reviewed/wait-merge
lunny
approved these changes
Oct 31, 2023
|
I was unable to create a backport for 1.21. @wxiaoguang, please send one manually. 🍵 |
GiteaBot
added
backport/manual
silverwind
pushed a commit
that referenced
this pull request
Oct 31, 2023
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Nov 1, 2023
* giteaofficial/main: Clean up template locale usage (go-gitea#27856)
lng2020
removed
the
backport/manual
fuxiaohei
pushed a commit
to fuxiaohei/gitea
that referenced
this pull request
Jan 17, 2024
After many refactoring PRs for the "locale" and "template context function", now the ".locale" is not needed for web templates any more. This PR does a clean up for: 1. Remove `ctx.Data["locale"]` for web context. 2. Use `ctx.Locale` in `500.tmpl`, for consistency. 3. Add a test check for `500 page` locale usage. 4. Remove the `Str2html` and `DotEscape` from mail template context data, they are copy&paste errors introduced by go-gitea#19169 and go-gitea#16200 . These functions are template functions (provided by the common renderer), but not template data variables. 5. Make email `SendAsync` function mockable (I was planning to add more tests but it would make this PR much too complex, so the tests could be done in another PR)
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.
After many refactoring PRs for the "locale" and "template context function", now the ".locale" is not needed for web templates any more.
This PR does a clean up for:
ctx.Data["locale"]for web context.ctx.Localein500.tmpl, for consistency.500 pagelocale usage.Str2htmlandDotEscapefrom mail template context data, they are copy&paste errors introduced by Try to prevent autolinking of displaynames in activation emails by email readers #19169 and Localize Email Templates #16200 . These functions are template functions (provided by the common renderer), but not template data variables.SendAsyncfunction mockable (I was planning to add more tests but it would make this PR much too complex, so the tests could be done in another PR)