Skip to content

bugzilla
bugzilla
Commit a32c7ed3 authored by Дмитрий Никулин's avatar Дмитрий Никулин Committed by Vitaly Lipatov
Browse files
Options

Add helper message on conflict

parent dd05dc20
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
template/en/default/bug/process/midair.html.tmpl
View file @ a32c7ed3
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
[% END %] [% END %]
<p> <p>
Return to previous page, copy your comment text, refresh the page
and then submit the comment again.
</p>
<!--
<p>
You have the following choices: You have the following choices:
</p> </p>
...@@ -88,5 +94,6 @@ You have the following choices: ...@@ -88,5 +94,6 @@ You have the following choices:
[%+ "revisit $terms.bug $bug.id" FILTER bug_link(bug) FILTER none %] [%+ "revisit $terms.bug $bug.id" FILTER bug_link(bug) FILTER none %]
</li> </li>
</ul> </ul>
-->
[% PROCESS global/footer.html.tmpl %] [% PROCESS global/footer.html.tmpl %]
template/ru/default/bug/process/midair.html.tmpl
View file @ a32c7ed3
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
[% END %] [% END %]
<p> <p>
Вернитесь на предыдущую страницу, сохраните текст комментария,
обновите страницу, после чего снова отправьте комментарий.
</p>
<!--
<p>
Возможные варианты: Возможные варианты:
</p> </p>
...@@ -88,5 +94,6 @@ ...@@ -88,5 +94,6 @@
[%+ "вернуться к $terms.bug $bug.id" FILTER bug_link(bug) FILTER none %] [%+ "вернуться к $terms.bug $bug.id" FILTER bug_link(bug) FILTER none %]
</li> </li>
</ul> </ul>
-->
[% PROCESS global/footer.html.tmpl %] [% PROCESS global/footer.html.tmpl %]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment