Skip to content

Commit 852890b

Browse files
committed
erb-format app/views/answers/_locking.html.erb --write
1 parent e72ec66 commit 852890b

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed
Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1-
<!--
2-
TEST This partial displays when a question was edit by two or more users. The local variables are: answer, question, readonly, locking
3-
-->
1+
<!-- TEST This partial displays when a question was edit by two or more users.
2+
The local variables are: answer, question, readonly, locking -->
43
<div class="answer_notice">
5-
<p><%= _('The following answer cannot be saved') %></p>
6-
<%# We do not need to re-show example answers in this lock conflict section so leave template nil %>
7-
<%= render partial: '/answers/new_edit', locals: { template: nil, question: question, answer: answer, readonly: true, locking: true } %>
8-
<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>
4+
<p><%= _("The following answer cannot be saved") %></p>
5+
<%# We do not need to re-show example answers in this lock conflict section so leave template nil %>
6+
<%= render partial: "/answers/new_edit",
7+
locals: {
8+
template: nil,
9+
question: question,
10+
answer: answer,
11+
readonly: true,
12+
locking: true,
13+
} %>
14+
<p><%= _(
15+
"since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again.",
16+
) % { name: user.name } %></p>
917
</div>

0 commit comments

Comments
 (0)