From 23a6fa9421cfcf67754ff962782dcf99e6491bb9 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 16 Mar 2023 17:23:11 -0400 Subject: [PATCH] Make time tooltips interactive (#23526) (#23527) Backport #23526 by @silverwind Fixes https://codeberg.org/forgejo/forgejo/issues/511 Screenshot 2023-03-16 at 20 23 10 Co-authored-by: silverwind --- modules/timeutil/since.go | 4 ++-- web_src/js/modules/tippy.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go index 295ba7c10e..53c22258c4 100644 --- a/modules/timeutil/since.go +++ b/modules/timeutil/since.go @@ -233,7 +233,7 @@ func TimeSince(then time.Time, lang translation.Locale) template.HTML { } func htmlTimeSince(then, now time.Time, lang translation.Locale) template.HTML { - return template.HTML(fmt.Sprintf(`%s`, + return template.HTML(fmt.Sprintf(`%s`, then.In(setting.DefaultUILocation).Format(GetTimeFormat(lang.Language())), timeSince(then, now, lang))) } @@ -244,7 +244,7 @@ func TimeSinceUnix(then TimeStamp, lang translation.Locale) template.HTML { } func htmlTimeSinceUnix(then, now TimeStamp, lang translation.Locale) template.HTML { - return template.HTML(fmt.Sprintf(`%s`, + return template.HTML(fmt.Sprintf(`%s`, then.FormatInLocation(GetTimeFormat(lang.Language()), setting.DefaultUILocation), timeSinceUnix(int64(then), int64(now), lang))) } diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js index ce8f0369f1..720f8ba53b 100644 --- a/web_src/js/modules/tippy.js +++ b/web_src/js/modules/tippy.js @@ -33,6 +33,7 @@ export function initTooltip(el, props = {}) { content, delay: 100, role: 'tooltip', + ...(el.getAttribute('data-tooltip-interactive') === 'true' ? {interactive: true} : {}), ...props, }); }