From 1c85b315385953c7e546c74de9a0a8db2d80bf37 Mon Sep 17 00:00:00 2001
From: Hunter Smith <1946720+hunternet93@users.noreply.github.com>
Date: Tue, 30 Dec 2025 13:38:03 -0800
Subject: [PATCH 1/5] AO3-7246 Add Parent link to reply comments

---
 app/views/comments/_comment_actions.html.erb    |  7 ++++---
 features/comments_and_kudos/add_comment.feature | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/views/comments/_comment_actions.html.erb b/app/views/comments/_comment_actions.html.erb
index 766bbe9e29c..f755149f73f 100644
--- a/app/views/comments/_comment_actions.html.erb
+++ b/app/views/comments/_comment_actions.html.erb
@@ -11,12 +11,13 @@
   <% if can_reply_to_comment?(comment) %>
     <li id="add_comment_reply_link_<%= comment.id %>"><%= add_comment_reply_link comment %></li>
   <% end %>
-  <% unless comment.unreviewed? %>
-    <li><%= link_to ts("Thread"), comment %></li>
-  <% end %>
   <% if comment.depth > 0 %>
+    <li><%= link_to ts("Parent"), comment_path(id: comment.commentable) %></li>
     <li><%= link_to ts("Parent Thread"), comment_path(id: comment.thread) %></li>
   <% end %>
+  <% unless comment.unreviewed? %>
+    <li><%= link_to ts("Thread"), comment %></li>
+  <% end %>
   <% if can_freeze_comment?(comment) %>
     <li><%= freeze_comment_button(comment) %></li>
   <% end %>
diff --git a/features/comments_and_kudos/add_comment.feature b/features/comments_and_kudos/add_comment.feature
index 383f5771de6..5326d274872 100644
--- a/features/comments_and_kudos/add_comment.feature
+++ b/features/comments_and_kudos/add_comment.feature
@@ -186,6 +186,20 @@ Scenario: Comment threading, comment editing
     Then I should see "must be less than"
       And I should see "Now, we can devour the gods, together!"
 
+Scenario: I can see "Parent" and "Parent Thread" links on reply comments but not on top-level comments
+
+  Given the work "Random Work"
+  When I am logged in as "commenter"
+    And I post the comment "This is the top-level comment" on the work "Random Work"
+  Then I should not see "Parent"
+    And I should not see "Parent Thread"
+
+  When I reply to a comment with "This is the reply comment"
+  Then I should not see "Parent" within ".odd"
+    And I should not see "Parent Thread" within ".odd"
+    And I should see "Parent" within ".even"
+    And I should see "Parent Thread" within ".even"
+
 Scenario: Don't receive comment notifications of your own comments by default
 
   When I am logged in as "author"

From a91fd1688932e1a4dff5b32acd858a364c7f4552 Mon Sep 17 00:00:00 2001
From: Hunter Smith <1946720+hunternet93@users.noreply.github.com>
Date: Tue, 30 Dec 2025 15:57:52 -0800
Subject: [PATCH 2/5] Skipped extraneous query by using ID field directly

---
 app/views/comments/_comment_actions.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/comments/_comment_actions.html.erb b/app/views/comments/_comment_actions.html.erb
index f755149f73f..b58a986bf5a 100644
--- a/app/views/comments/_comment_actions.html.erb
+++ b/app/views/comments/_comment_actions.html.erb
@@ -12,7 +12,7 @@
     <li id="add_comment_reply_link_<%= comment.id %>"><%= add_comment_reply_link comment %></li>
   <% end %>
   <% if comment.depth > 0 %>
-    <li><%= link_to ts("Parent"), comment_path(id: comment.commentable) %></li>
+    <li><%= link_to ts("Parent"), comment_path(id: comment.commentable_id) %></li>
     <li><%= link_to ts("Parent Thread"), comment_path(id: comment.thread) %></li>
   <% end %>
   <% unless comment.unreviewed? %>

From 1740d78978e711348c29d576da988a04d4f0c751 Mon Sep 17 00:00:00 2001
From: Hunter Smith <1946720+hunternet93@users.noreply.github.com>
Date: Wed, 31 Dec 2025 10:44:46 -0800
Subject: [PATCH 3/5] Refactored comment_actions template to use correct
 translation method and pass erblint

---
 app/views/comments/_comment_actions.html.erb | 20 ++++++++++----------
 config/locales/views/en.yml                  |  8 ++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/views/comments/_comment_actions.html.erb b/app/views/comments/_comment_actions.html.erb
index b58a986bf5a..c4f477c2f05 100644
--- a/app/views/comments/_comment_actions.html.erb
+++ b/app/views/comments/_comment_actions.html.erb
@@ -1,4 +1,4 @@
-<h5 class="landmark heading"><%= ts("Comment Actions") %></h5>
+<h5 class="landmark heading"><%= t(".comment_actions") %></h5>
 
 <ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if focused_on_comment(comment) %> style="display:none;"<% end %>>
   <%# The effect is "Frozen" replaces "Reply." We can't do that in the helper
@@ -12,11 +12,11 @@
     <li id="add_comment_reply_link_<%= comment.id %>"><%= add_comment_reply_link comment %></li>
   <% end %>
   <% if comment.depth > 0 %>
-    <li><%= link_to ts("Parent"), comment_path(id: comment.commentable_id) %></li>
-    <li><%= link_to ts("Parent Thread"), comment_path(id: comment.thread) %></li>
+    <li><%= link_to t(".parent"), comment_path(id: comment.commentable_id) %></li>
+    <li><%= link_to t(".parent_thread"), comment_path(id: comment.thread) %></li>
   <% end %>
   <% unless comment.unreviewed? %>
-    <li><%= link_to ts("Thread"), comment %></li>
+    <li><%= link_to t(".thread"), comment %></li>
   <% end %>
   <% if can_freeze_comment?(comment) %>
     <li><%= freeze_comment_button(comment) %></li>
@@ -36,7 +36,7 @@
   <% end %>
   <% if can_review_comment?(comment) %>
     <li id="review_comment_link_<%= comment.id %>">
-      <%= button_to(ts("Approve"), review_comment_path(comment), method: :put) %>
+      <%= button_to(t(".approve"), review_comment_path(comment), method: :put) %>
     </li>
   <% end %>
   <% if can_destroy_comment?(comment) %>
@@ -65,11 +65,11 @@
   <%# This is where the reply-to box will be added when "Reply" is hit, if the user has JavaScript. %>
   <%# If not, we will render the comment form if this is the comment we are replying to. %>
   <% if focused_on_comment(comment) %>
-    <div id="add_comment_reply_placeholder_<%= comment.id %>" title="<%= ts("reply to this comment") %>">
-      <%= render 'comments/comment_form',
-        :comment => Comment.new,
-        :commentable => comment,
-        :button_name => ts("Comment") %>
+    <div id="add_comment_reply_placeholder_<%= comment.id %>" title="<%= t(".reply_to_this") %>">
+      <%= render "comments/comment_form",
+            comment: Comment.new,
+            commentable: comment,
+            button_name: t(".comment") %>
   <% else %>
     <div id="add_comment_reply_placeholder_<%= comment.id %>" style="display: none;">
   <% end %>
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 12b3e8d85da..5641daee899 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -788,6 +788,14 @@ en:
         admin_post: Please note that comments cannot be unapproved once you have approved them. After you delete any comments you do not wish to appear on the news post, you can approve all that remain.
         work: Please note that comments cannot be unapproved once you have reviewed them. After you delete any comments you do not wish to appear on your work, you can approve all that remain.
       page_heading_html: Unreviewed Comments on %{commentable_link}
+    comment_actions:
+      comment_actions: Comment Actions
+      parent: Parent
+      thread: Thread
+      parent_thread: Parent Thread
+      approve: Approve
+      reply_to_this: reply to this comment
+      comment: Comment
   downloads:
     download_afterword:
       afterword: Afterword

From 4eb4679bcef74891beb8e706b8e101cbcb3ce78d Mon Sep 17 00:00:00 2001
From: Hunter Smith <1946720+hunternet93@users.noreply.github.com>
Date: Wed, 31 Dec 2025 12:07:34 -0800
Subject: [PATCH 4/5] Normalized views localizations

---
 config/locales/views/en.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 5641daee899..d8cb439d6a7 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -712,6 +712,14 @@ en:
       tags: Tags
       works: Works (%{count})
   comments:
+    comment_actions:
+      approve: Approve
+      comment: Comment
+      comment_actions: Comment Actions
+      parent: Parent
+      parent_thread: Parent Thread
+      reply_to_this: reply to this comment
+      thread: Thread
     comment_form:
       anonymous_creator: Anonymous Creator
       anonymous_forewarning: While this work is anonymous, comments you post will also be listed anonymously.
@@ -788,14 +796,6 @@ en:
         admin_post: Please note that comments cannot be unapproved once you have approved them. After you delete any comments you do not wish to appear on the news post, you can approve all that remain.
         work: Please note that comments cannot be unapproved once you have reviewed them. After you delete any comments you do not wish to appear on your work, you can approve all that remain.
       page_heading_html: Unreviewed Comments on %{commentable_link}
-    comment_actions:
-      comment_actions: Comment Actions
-      parent: Parent
-      thread: Thread
-      parent_thread: Parent Thread
-      approve: Approve
-      reply_to_this: reply to this comment
-      comment: Comment
   downloads:
     download_afterword:
       afterword: Afterword

From 3cdedda4ffdab7fb112bef52814d79b4cc281717 Mon Sep 17 00:00:00 2001
From: Hunter Smith <1946720+hunternet93@users.noreply.github.com>
Date: Fri, 2 Jan 2026 11:27:07 -0800
Subject: [PATCH 5/5] Capitalized en.comments.comment_actions.reply_to_this
 localization string

---
 config/locales/views/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index d8cb439d6a7..9b996fcaa24 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -718,7 +718,7 @@ en:
       comment_actions: Comment Actions
       parent: Parent
       parent_thread: Parent Thread
-      reply_to_this: reply to this comment
+      reply_to_this: Reply to this comment
       thread: Thread
     comment_form:
       anonymous_creator: Anonymous Creator