From adea500aa07eb05e4456b516b4d9ca5f41adb937 Mon Sep 17 00:00:00 2001
From: Kemal Zebari <60799661+kemzeb@users.noreply.github.com>
Date: Wed, 18 Sep 2024 12:46:41 -0700
Subject: [PATCH] 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.
---
 models/issues/review.go         | 2 +-
 options/locale/locale_en-US.ini | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/issues/review.go b/models/issues/review.go
index 9a08e265ff..9fb6d7573a 100644
--- 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 dc85d7c97c..957e73b171 100644
--- 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