From 41031b5db84b81a7f576c4b9867d32031f9220e2 Mon Sep 17 00:00:00 2001
From: aaronskiba <askiba@ualberta.ca>
Date: Thu, 10 Jul 2025 16:06:10 -0600
Subject: [PATCH 1/3] Update _locking.html.erb

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

diff --git a/app/views/answers/_locking.html.erb b/app/views/answers/_locking.html.erb
index ed8ee29cb0..6fa7ed94c3 100644
--- a/app/views/answers/_locking.html.erb
+++ b/app/views/answers/_locking.html.erb
@@ -1,5 +1,5 @@
 <!--
-  This partial displays when a question was edit by two or more users. The local variables are: answer, question, readonly, locking
+  TEST This partial displays when a question was edit by two or more users. The local variables are: answer, question, readonly, locking
 -->
 <div class="answer_notice">
     <p><%= _('The following answer cannot be saved') %></p>

From add6c2e4093a0b5686866e1f0c1b3b114c66834d Mon Sep 17 00:00:00 2001
From: aaronskiba <askiba@ualberta.ca>
Date: Fri, 11 Jul 2025 09:55:06 -0600
Subject: [PATCH 2/3] Update _new_edit.html.erb

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

diff --git a/app/views/answers/_new_edit.html.erb b/app/views/answers/_new_edit.html.erb
index 24e47f10cc..8a52c9a1fa 100644
--- a/app/views/answers/_new_edit.html.erb
+++ b/app/views/answers/_new_edit.html.erb
@@ -1,6 +1,6 @@
 <%# locals: { template, question, answer, readonly, locking } %>
 <!--
-  This partial creates a form for each type of question. The local variables are: plan, answer, question, readonly
+  TEST This partial creates a form for each type of question. The local variables are: plan, answer, question, readonly
 -->
 <!-- Question text -->
 <% q_format = question.question_format %>

From 865d1586541c9addb51eb185e4ca5ef04acbe1a3 Mon Sep 17 00:00:00 2001
From: aaronskiba <askiba@ualberta.ca>
Date: Fri, 11 Jul 2025 12:42:44 -0600
Subject: [PATCH 3/3] erb-format app/views/answers/_locking.html.erb --write

---
 app/views/answers/_locking.html.erb | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/views/answers/_locking.html.erb b/app/views/answers/_locking.html.erb
index 6fa7ed94c3..fab13341eb 100644
--- a/app/views/answers/_locking.html.erb
+++ b/app/views/answers/_locking.html.erb
@@ -1,9 +1,17 @@
-<!--
-  TEST This partial displays when a question was edit by two or more users. The local variables are: answer, question, readonly, locking
--->
+<!-- TEST This partial displays when a question was edit by two or more users.
+The local variables are: answer, question, readonly, locking -->
 <div class="answer_notice">
-    <p><%= _('The following answer cannot be saved') %></p>
-    <%# We do not need to re-show example answers in this lock conflict section so leave template nil %>
-    <%= render partial: '/answers/new_edit', locals: { template: nil, question: question, answer: answer, readonly: true, locking: true } %>
-    <p><%= _('since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again.') % { name: user.name} %></p>
+  <p><%= _("The following answer cannot be saved") %></p>
+  <%# We do not need to re-show example answers in this lock conflict section so leave template nil %>
+  <%= render partial: "/answers/new_edit",
+  locals: {
+    template: nil,
+    question: question,
+    answer: answer,
+    readonly: true,
+    locking: true,
+  } %>
+  <p><%= _(
+      "since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again.",
+    ) % { name: user.name } %></p>
 </div>