Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix modified due date message #20388

Merged
merged 5 commits into from
Jul 19, 2022
Merged

Fix modified due date message #20388

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39b8d02
Fix modified due date message
lhsazevedo Jul 16, 2022
8d4f7da
Make due_date_modified sound more natural
lhsazevedo Jul 17, 2022
e1e8f7d
Merge branch 'main' into due_date_modified
wxiaoguang Jul 18, 2022
804af08
Use indexed formatting verbs in due_date_modified
lhsazevedo Jul 19, 2022
aab1020
Merge branch 'main' into due_date_modified
6543 Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,7 @@ issues.due_date_form_remove = "Remove"
issues.due_date_not_writer = "You need repository write access to update an issue's due date."
issues.due_date_not_set = "No due date set."
issues.due_date_added = "added the due date %s %s"
issues.due_date_modified = "modified the due date to %s from %s %s"
issues.due_date_modified = "modified the due date from %s to %s %s"
lhsazevedo marked this conversation as resolved.
Show resolved Hide resolved
issues.due_date_remove = "removed the due date %s %s"
issues.due_date_overdue = "Overdue"
issues.due_date_invalid = "The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'."
Expand Down
3 changes: 2 additions & 1 deletion templates/repo/issue/view_content/comments.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,8 @@
</a>
<span class="text grey">
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
{{$.locale.Tr "repo.issues.due_date_modified" (.Content | ParseDeadline) $createdStr | Safe}}
{{$parsedDeadline := .Content | ParseDeadline}}
6543 marked this conversation as resolved.
Show resolved Hide resolved
{{$.locale.Tr "repo.issues.due_date_modified" (index $parsedDeadline 1) (index $parsedDeadline 0) $createdStr | Safe}}
</span>
</div>
{{else if eq .Type 18}}
Expand Down