aboutsummaryrefslogtreecommitdiffstats
path: root/templates/admin/cron.tmpl
diff options
context:
space:
mode:
authorYarden Shoham <git@yardenshoham.com>2023-04-23 22:12:33 +0300
committerGitHub <noreply@github.com>2023-04-23 15:12:33 -0400
commit70bb4984cdad9a15d676708bd345b590aa42d72a (patch)
treedda9461e4928839fa08641d68cf1c5bb29252b3d /templates/admin/cron.tmpl
parentcbe2e99aed5e479b0fae38726e16baefacb1a7f1 (diff)
downloadgitea-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 ![image](https://user-images.githubusercontent.com/20454870/233791256-b454c455-aca0-4b76-b300-7866c7bd529e.png) # After ![image](https://user-images.githubusercontent.com/20454870/233790809-c4913355-2822-4657-bb29-2298deb6d4b3.png) --------- Signed-off-by: Yarden Shoham <git@yardenshoham.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'templates/admin/cron.tmpl')
-rw-r--r--templates/admin/cron.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/admin/cron.tmpl b/templates/admin/cron.tmpl
index 51685112ba..5dd6314944 100644
--- a/templates/admin/cron.tmpl
+++ b/templates/admin/cron.tmpl
@@ -21,8 +21,8 @@
<td><button type="submit" class="ui green button" name="op" value="{{.Name}}" title="{{$.locale.Tr "admin.dashboard.operation_run"}}">{{svg "octicon-triangle-right"}}</button></td>
<td>{{$.locale.Tr (printf "admin.dashboard.%s" .Name)}}</td>
<td>{{.Spec}}</td>
- <td>{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Next) "Fallback" (DateFmtLong .Next) )}}</td>
- <td>{{if gt .Prev.Year 1}}{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Prev) "Fallback" (DateFmtLong .Prev) )}}{{else}}N/A{{end}}</td>
+ <td>{{DateTime "full" (DateFmtLong .Next) (DateFmtLong .Next)}}</td>
+ <td>{{if gt .Prev.Year 1}}{{DateTime "full" (DateFmtLong .Prev) (DateFmtLong .Prev)}}{{else}}N/A{{end}}</td>
<td>{{.ExecTimes}}</td>
<td {{if ne .Status ""}}data-tooltip-content="{{.FormatLastMessage $.locale}}"{{end}} >{{if eq .Status ""}}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}}</td>
</tr>