diff --git a/app/views/answers/_locking.html.erb b/app/views/answers/_locking.html.erb index ed8ee29cb0..fab13341eb 100644 --- a/app/views/answers/_locking.html.erb +++ b/app/views/answers/_locking.html.erb @@ -1,9 +1,17 @@ - +
-

<%= _('The following answer cannot be saved') %>

- <%# 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 } %> -

<%= _('since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again.') % { name: user.name} %>

+

<%= _("The following answer cannot be saved") %>

+ <%# 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, + } %> +

<%= _( + "since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again.", + ) % { name: user.name } %>

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 } %> <% q_format = question.question_format %>