rdelaage
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Commit

This commit is contained in:
stuzer05 2023-02-24 23:54:01 +02:00
parent 29dd61722b
commit 7be748f63b
2 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
options/locale/locale_en-US.ini
View File

@ -1452,15 +1452,15 @@ issues.start_tracking_history = `started working %s`
issues.tracker_auto_close = Timer will be stopped automatically when this issue gets closed
issues.tracking_already_started = `You have already started time tracking on <a href="%s">another issue</a>!`
issues.stop_tracking = Stop Timer
issues.stop_tracking_history = `stopped working %s`
issues.stop_tracking_history = `worked for <b>%s</b> %s`
issues.cancel_tracking = Discard
issues.cancel_tracking_history = `cancelled time tracking %s`
issues.add_time = Manually Add Time
issues.del_time = Delete this time log
issues.add_time_short = Add Time
issues.add_time_cancel = Cancel
issues.add_time_history = `added spent time %s`
issues.del_time_history= `deleted spent time %s`
issues.add_time_history = `added spent time <b>%s</b> %s`
issues.del_time_history= `deleted spent time <b>%s</b> %s`
issues.add_time_hours = Hours
issues.add_time_minutes = Minutes
issues.add_time_sum_to_small = No time was entered.

62
templates/repo/issue/view_content/comments.tmpl
View File

@ -11,7 +11,7 @@
26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST,
29 = PULL_PUSH_EVENT, 30 = PROJECT_CHANGED, 31 = PROJECT_BOARD_CHANGED
32 = DISMISSED_REVIEW, 33 = COMMENT_TYPE_CHANGE_ISSUE_REF, 34 = PR_SCHEDULE_TO_AUTO_MERGE,
35 = CANCEL_SCHEDULED_AUTO_MERGE_PR -->
35 = CANCEL_SCHEDULED_AUTO_MERGE_PR, 36 = COMMENT_TYPE_CHANGE_TIME_ESTIMATE -->
{{if eq .Type 0}}
<div class="timeline-item comment" id="{{.HashTag}}">
{{if .OriginalAuthor}}
@ -258,18 +258,19 @@
{{template "shared/user/avatarlink" Dict "Context" $.Context "user" .Poster}}
<span class="text grey muted-links">
{{template "shared/user/authorlink" .Poster}}
{{$.locale.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}}
{{$timeStr := .Content}} <!-- legacy support -->
{{if eq .Content ""}}
{{if lt .TimeTracked 60}}
{{$timeStr = SecToTimeExact .TimeTracked true}}
{{else}}
{{$timeStr = SecToTimeExact .TimeTracked false}}
{{end}}
{{end}}
{{$.locale.Tr "repo.issues.stop_tracking_history" $timeStr $createdStr | Safe}}
</span>
{{template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" .}}
<div class="detail">
{{svg "octicon-clock"}}
{{if eq .Content ""}}
<span class="text grey muted-links">{{if lt .TimeTracked 60}}{{SecToTimeExact .TimeTracked true}}{{else}}{{SecToTimeExact .TimeTracked false}}{{end}}</span>
{{else}}
<!-- legacy support -->
<span class="text grey muted-links">{{.Content}}</span>
{{end}}
</div>
</div>
{{else if eq .Type 14}}
<div class="timeline-item event" id="{{.HashTag}}">
@ -277,18 +278,19 @@
{{template "shared/user/avatarlink" Dict "Context" $.Context "user" .Poster}}
<span class="text grey muted-links">
{{template "shared/user/authorlink" .Poster}}
{{$.locale.Tr "repo.issues.add_time_history" $createdStr | Safe}}
{{$timeStr := .Content}} <!-- legacy support -->
{{if eq .Content ""}}
{{if lt .TimeTracked 60}}
{{$timeStr = SecToTimeExact .TimeTracked true}}
{{else}}
{{$timeStr = SecToTimeExact .TimeTracked false}}
{{end}}
{{end}}
{{$.locale.Tr "repo.issues.add_time_history" $timeStr $createdStr | Safe}}
</span>
{{template "repo/issue/view_content/comments_delete_time" Dict "ctx" $ "comment" .}}
<div class="detail">
{{svg "octicon-clock"}}
{{if eq .Content ""}}
<span class="text grey muted-links">{{if lt .TimeTracked 60}}{{SecToTimeExact .TimeTracked true}}{{else}}{{SecToTimeExact .TimeTracked false}}{{end}}</span>
{{else}}
<!-- legacy support -->
<span class="text grey muted-links">{{.Content}}</span>
{{end}}
</div>
</div>
{{else if eq .Type 15}}
<div class="timeline-item event" id="{{.HashTag}}">
@ -674,17 +676,17 @@
<span class="text grey muted-links">
{{template "shared/user/authorlink" .Poster}}
{{$.locale.Tr "repo.issues.del_time_history" $createdStr | Safe}}
</span>
<div class="detail">
{{svg "octicon-clock"}}
{{$timeStr := .Content}} <!-- legacy support -->
{{if eq .Content ""}}
<span class="text grey muted-links">{{if lt .TimeTracked 60}}{{SecToTimeExact .TimeTracked true}}{{else}}{{SecToTimeExact .TimeTracked false}}{{end}}</span>
{{else}}
<!-- legacy support -->
<span class="text grey muted-links">{{.Content}}</span>
{{if lt .TimeTracked 60}}
{{$timeStr = SecToTimeExact .TimeTracked true}}
{{else}}
{{$timeStr = SecToTimeExact .TimeTracked false}}
{{end}}
{{end}}
</div>
{{$.locale.Tr "repo.issues.del_time_history" $timeStr $createdStr | Safe}}
</span>
</div>
{{else if eq .Type 27}}
<div class="timeline-item event" id="{{.HashTag}}">