diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-10-31 22:11:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-31 22:11:48 +0800 |
| commit | a4b242ae7a3edc6302a2730a01cda5a2e76bd6b5 (patch) | |
| tree | 525ac99acfa676038e6d0af57bec90c4e0517560 /templates | |
| parent | 16d15ce087cd4b9ddf91f6acff7eacac24e6aac5 (diff) | |
| download | gitea-a4b242ae7a3edc6302a2730a01cda5a2e76bd6b5.tar.gz gitea-a4b242ae7a3edc6302a2730a01cda5a2e76bd6b5.zip | |
Clean up template locale usage (#27856)
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 #19169 and #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)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/status/500.tmpl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl index e5570bde73..edcb90f9a4 100644 --- a/templates/status/500.tmpl +++ b/templates/status/500.tmpl @@ -1,12 +1,12 @@ {{/* This page should only depend the minimal template functions/variables, to avoid triggering new panics. * base template functions: AppName, AssetUrlPrefix, AssetVersion, AppSubUrl, ThemeName, Str2html -* locale -* Flash -* ErrorMsg -* SignedUser (optional) +* ctx.Locale +* .Flash +* .ErrorMsg +* .SignedUser (optional) */}} <!DOCTYPE html> -<html lang="{{.locale.Lang}}" data-theme="{{ThemeName .SignedUser}}"> +<html lang="{{ctx.Locale.Lang}}" data-theme="{{ThemeName .SignedUser}}"> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Internal Server Error - {{AppName}}</title> @@ -19,8 +19,8 @@ <nav class="ui secondary menu gt-border-secondary-bottom"> <div class="ui container gt-df"> <div class="item gt-f1"> - <a href="{{AppSubUrl}}/" aria-label="{{.locale.Tr "home"}}"> - <img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true"> + <a href="{{AppSubUrl}}/" aria-label="{{ctx.Locale.Tr "home"}}"> + <img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}" aria-hidden="true"> </a> </div> <div class="item"> @@ -37,12 +37,12 @@ <div class="divider"></div> <div class="ui container gt-my-5"> {{if .ErrorMsg}} - <p>{{.locale.Tr "error.occurred"}}:</p> + <p>{{ctx.Locale.Tr "error.occurred"}}:</p> <pre class="gt-whitespace-pre-wrap gt-break-all">{{.ErrorMsg}}</pre> {{end}} <div class="center gt-mt-5"> - {{if or .SignedUser.IsAdmin .ShowFooterVersion}}<p>{{.locale.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}} - {{if .SignedUser.IsAdmin}}<p>{{.locale.Tr "error.report_message" | Str2html}}</p>{{end}} + {{if or .SignedUser.IsAdmin .ShowFooterVersion}}<p>{{ctx.Locale.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}} + {{if .SignedUser.IsAdmin}}<p>{{ctx.Locale.Tr "error.report_message" | Str2html}}</p>{{end}} </div> </div> </div> |