aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-04 14:46:57 -05:00
Code

Resolve duplicate local string key related to PR comments (#32073)

Browse Source 
A regression in #31924 caused there to be two `issues.review.comment`
keys in the English language locale file, leading to a problem when
reading PR review histories that contain comments.

This snapshot addresses this by making the newer key unique.
This commit is contained in:
Kemal Zebari 2024-09-18 12:46:41 -07:00 committed by GitHub
parent 1fede04b83
commit adea500aa0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/issues/review.go
View File

@ -247,7 +247,7 @@ func (r *Review) TooltipContent() string {
} }
return "repo.issues.review.official" return "repo.issues.review.official"
case ReviewTypeComment: case ReviewTypeComment:
return "repo.issues.review.comment" return "repo.issues.review.commented"
case ReviewTypeReject: case ReviewTypeReject:
return "repo.issues.review.rejected" return "repo.issues.review.rejected"
case ReviewTypeRequest: case ReviewTypeRequest:

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

@ -1757,7 +1757,7 @@ issues.review.hide_resolved = Hide resolved
issues.review.resolve_conversation = Resolve conversation issues.review.resolve_conversation = Resolve conversation
issues.review.un_resolve_conversation = Unresolve conversation issues.review.un_resolve_conversation = Unresolve conversation
issues.review.resolved_by = marked this conversation as resolved issues.review.resolved_by = marked this conversation as resolved
issues.review.comment = Comment issues.review.commented = Comment
issues.review.official = Approved issues.review.official = Approved
issues.review.requested = Review pending issues.review.requested = Review pending
issues.review.rejected = Changes requested issues.review.rejected = Changes requested