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

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.

diff --git a/models/issues/review.go b/models/issues/review.go
index 9a08e265ff342f10f003324cde437fcc0d65cf1b..9fb6d7573a8bcf357d90268c2f92746549bda947 100644 (file)
--- a/models/issues/review.go
+++ b/models/issues/review.go
@@ -247,7 +247,7 @@ func (r *Review) TooltipContent() string {
                }
                return "repo.issues.review.official"
        case ReviewTypeComment:
-               return "repo.issues.review.comment"
+               return "repo.issues.review.commented"
        case ReviewTypeReject:
                return "repo.issues.review.rejected"
        case ReviewTypeRequest:

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index dc85d7c97ca27f7f934f296cb0bcb77e9f2dead8..957e73b171d32ccc29ccfd3d5268eedb1ac18ee8 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1757,7 +1757,7 @@ issues.review.hide_resolved = Hide resolved
 issues.review.resolve_conversation = Resolve conversation
 issues.review.un_resolve_conversation = Unresolve conversation
 issues.review.resolved_by = marked this conversation as resolved
-issues.review.comment = Comment
+issues.review.commented = Comment
 issues.review.official = Approved
 issues.review.requested = Review pending
 issues.review.rejected = Changes requested