diff options
| author | Yarden Shoham <git@yardenshoham.com> | 2023-04-23 22:12:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-23 15:12:33 -0400 |
| commit | 70bb4984cdad9a15d676708bd345b590aa42d72a (patch) | |
| tree | dda9461e4928839fa08641d68cf1c5bb29252b3d /templates/admin/user | |
| parent | cbe2e99aed5e479b0fae38726e16baefacb1a7f1 (diff) | |
| download | gitea-70bb4984cdad9a15d676708bd345b590aa42d72a.tar.gz gitea-70bb4984cdad9a15d676708bd345b590aa42d72a.zip | |
Allow using localized absolute date times within phrases with place holders and localize issue due date events (#24275)
This refactors the `shared/datetime/short|long|full` templates into a
template helper function, which allows us to render absolute date times
within translatable phrases.
- Follows #23988
- The first attempt was in #24055
- This should help #22664
Changes:
1. Added the `DateTime` template helper that replaces the
`shared/datetime/short|long|full` templates
2. Used find-and-replace with varying regexes to replace the templates
from step 1 (for example, `\{\{template "shared/datetime/(\S+) \(dict
"Datetime" ([^"]+) "Fallback" ([^\)]+\)?) ?\)?\}\}` -> `{{DateTime "$1
$2 $3}}`)
3. Used the new `DateTime` helper in the issue due date timestamp
rendering
# Before
# After
---------
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'templates/admin/user')
| -rw-r--r-- | templates/admin/user/list.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index c7644b3b4e..fef7c7b27f 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -91,9 +91,9 @@ <td>{{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td> <td>{{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td> <td>{{.NumRepos}}</td> - <td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td> + <td>{{DateTime "short" .CreatedUnix.FormatLong .CreatedUnix.FormatShort}}</td> {{if .LastLoginUnix}} - <td>{{template "shared/datetime/short" (dict "Datetime" .LastLoginUnix.FormatLong "Fallback" .LastLoginUnix.FormatShort)}}</td> + <td>{{DateTime "short" .LastLoginUnix.FormatLong .LastLoginUnix.FormatShort}}</td> {{else}} <td><span>{{$.locale.Tr "admin.users.never_login"}}</span></td> {{end}} |