fix action message

Author: wxiaoguang

modules/templates/helper.go

@@ -71,7 +71,7 @@ func NewFuncMap() template.FuncMap {
 		"CountFmt": base.FormatNumberSI,
 		"Sec2Time": util.SecToTime,
 
-		"TimeEstimateString": util.TimeEstimateString,
+		"TimeEstimateString": timeEstimateString,
 
 		"LoadTimes": func(startTime time.Time) string {
 			return fmt.Sprint(time.Since(startTime).Nanoseconds()/1e6) + "ms"
@@ -285,6 +285,14 @@ func userThemeName(user *user_model.User) string {
 	return setting.UI.DefaultTheme
 }
 
+func timeEstimateString(timeSec any) string {
+	v, _ := util.ToInt64(timeSec)
+	if v == 0 {
+		return ""
+	}
+	return util.TimeEstimateString(v)
+}
+
 func panicIfDevOrTesting() {
 	if !setting.IsProd || setting.IsInTesting {
 		panic("legacy template functions are for backward compatibility only, do not use them in new code")

options/locale/locale_en-US.ini

@@ -1681,7 +1681,7 @@ issues.time_estimate_placeholder = 1h 2m
 issues.time_estimate_set = Set estimated time
 issues.time_estimate_display = Estimate: %s
 issues.change_time_estimate_at = changed time estimate to <b>%s</b> %s
-issues.remove_time_estimate = removed time estimate %s
+issues.remove_time_estimate_at = removed time estimate %s
 issues.time_estimate_invalid = Time estimate format is invalid
 issues.start_tracking_history = started working %s
 issues.tracker_auto_close = Timer will be stopped automatically when this issue gets closed

templates/repo/issue/view_content/comments.tmpl

@@ -696,13 +696,11 @@
 				{{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}}
 				<span class="text grey muted-links">
 					{{template "shared/user/authorlink" .Poster}}
-
-					{{if .RenderedContent}}
-						{{/* compatibility with time comments made before v1.21 */}}
-						{{ctx.Locale.Tr "repo.issues.change_time_estimate_at" .RenderedContent $createdStr | SafeHTML}}
+					{{$timeStr := .Content|TimeEstimateString}}
+					{{if $timeStr}}
+						{{ctx.Locale.Tr "repo.issues.change_time_estimate_at" $timeStr $createdStr}}
 					{{else}}
-						{{$timeStr := .Content|Sec2Time}}
-						{{ctx.Locale.Tr "repo.issues.change_time_estimate_at" $timeStr $createdStr | SafeHTML}}
+						{{ctx.Locale.Tr "repo.issues.remove_time_estimate_at" $createdStr}}
 					{{end}}
 				</span>
 			</div>