X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..094acc5f44c3a7779f42b3d84c86213ba6a1003c:/forum/skins/default/templates/ask.html diff --git a/forum/skins/default/templates/ask.html b/forum/skins/default/templates/ask.html index e681f4f..557b072 100644 --- a/forum/skins/default/templates/ask.html +++ b/forum/skins/default/templates/ask.html @@ -1,14 +1,21 @@ {% extends "base.html" %} -{% load i18n %} -{% load extra_tags %} +{% load i18n extra_tags extra_filters %} {% block title %}{% spaceless %}{% trans "Ask a question" %}{% endspaceless %}{% endblock %} {% block forejs %} + + {% endblock %} {% block content %} @@ -52,21 +67,23 @@
-
+ {% if not request.user.is_authenticated %}
-

{% trans "login to post question info" %}

+ {% trans "You are welcome to start submitting your question anonymously." %} +

{% blocktrans %} + After submiting your question, you will be redirected to the login/signup page. + Your question will be saved in the current session and will be published after you login with your existing account, + or signup for a new account{% endblocktrans %}{% if "ask"|contained_in:settings.REQUIRE_EMAIL_VALIDATION_TO %} + {% trans "and validate your email." %}{% else %}.{% endif %}

{% else %} - {% ifequal settings.EMAIL_VALIDATION 'on' %} - {% if not request.user.email_isvalid %} -
- {% blocktrans with request.user.email as email %}must have valid {{email}} to post, - see {{email_validation_faq_url}} - {% endblocktrans %} -
- {% endif %} - {% endifequal %} + {% if not request.user.email_valid_and_can_ask %} +
+ {% blocktrans %}Remember, your question will not be published until you validate your email.{% endblocktrans %} + {% trans "Send me a validation link." %} +
+ {% endif %} {% endif %}

@@ -75,11 +92,10 @@ {{ form.title.help_text }}
- +
- {{ form.text }} - + {{ form.text }} {{ form.text.errors }}