1 files changed, 15 insertions, 5 deletions
diff --git a/askbot/templates/question_edit.html b/askbot/templates/question_edit.html
index 1b119f93..f6de6bdf 100644
--- a/askbot/templates/question_edit.html
+++ b/askbot/templates/question_edit.html
@@ -1,19 +1,19 @@
 {% extends "two_column_body.html" %}
 {% import "macros.html" as macros %}
 <!-- question_edit.html -->
-{% block title %}{% spaceless %}{% trans %}Edit question{% endtrans %}{% endspaceless %}{% endblock %}
+{% block title %}{% spaceless %}{{ settings.WORDS_EDIT_QUESTION|escape }}{% endspaceless %}{% endblock %}
 {% block forestyle %}
     <link rel="stylesheet" type="text/css" href="{{"/js/wmd/wmd.css"|media}}" />
 {% endblock %}
 {% block content %}
-<div class="section-title">{% trans %}Edit question{% endtrans %} [<a href="{{ question.get_absolute_url() }}">{% trans %}back{% endtrans %}</a>]</div>
+<div class="section-title">{{ settings.WORDS_EDIT_QUESTION|escape }} [<a href="{{ question.get_absolute_url() }}">{% trans %}back{% endtrans %}</a>]</div>
 <form id="fmedit" action="{% url edit_question question.id %}" method="post" >{% csrf_token %}
     {% if revision_form.revision.errors %}{{ revision_form.revision.errors.as_ul() }}{% endif %}
     {{ revision_form.revision }}
     <input type="hidden" id="select_revision" name="select_revision" value="false"/>
     <div class="form-item">
         <label for="id_title" >
-            {% trans %}Question - in one sentence{% endtrans %}
+            {{ settings.WORDS_QUESTION_IN_ONE_SENTENCE|escape }}
             {% if form.title.errors %}
                 {{ form.title.errors }}
             {% endif %}
@@ -35,6 +35,10 @@
                 )
     }}
     <div class="after-editor">
+        {% if form.recaptcha %}
+            <div>{{ macros.form_field_with_errors(form.recaptcha) }}</div>
+            <div class="clearfix"></div>
+        {% endif %}
         <div class="question-options">
             {% if settings.WIKI_ON and question.wiki == False %}
                 {{ macros.checkbox_in_div(form.wiki) }}
@@ -58,7 +62,7 @@
             </div>
             {% endif %}
         </div>
-        <input id="edit_post_form_submit_button" type="submit" value="{% trans %}Save edit{% endtrans %}" class="large submit" />&nbsp;
+        <input id="edit_post_form_submit_button" type="submit" value="{% trans %}Save edit{% endtrans %}" class="large submit" />
         <input type="button" value="{% trans %}Cancel{% endtrans %}" class="large submit" onclick="history.back(-1);" />
 
     </div>
@@ -66,7 +70,13 @@
 {% endblock %}
 
 {% block sidebar %}
-{% include "widgets/question_edit_tips.html" %}
+<div id ="tips" class="box">
+    <h2>{% trans %}Tips{% endtrans %}</h2>
+    {% include "widgets/question_edit_tips.html" %}
+</div>
+{% if settings.EDITOR_TYPE == 'markdown' %}
+    {% include "/widgets/markdown_help.html" %}
+{% endif %}
 {% endblock %}
 
 {% block endjs %}