diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
commit | 8de2b9131ddcef647799cf8e1e79921284523073 (patch) | |
tree | 81e17d84530990e35a0accba3a7886266a601482 /templates/faq.html | |
parent | 7e95e6481d1e81e43d4b442cbcf3fe37f20d89cc (diff) | |
parent | 9d1fb9890b97beb55461ca34f9757bc685461130 (diff) | |
download | askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.gz askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.bz2 askbot-8de2b9131ddcef647799cf8e1e79921284523073.zip |
Merge branch 'evgenyfadeev/master'
Conflicts:
.gitignore
INSTALL
TODO
cnprog.wsgi
django_authopenid/urls.py
django_authopenid/views.py
drop-all-tables.sh
forum/auth.py
forum/managers.py
forum/models.py
forum/templatetags/extra_tags.py
forum/views.py
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
settings.py
settings_local.py.dist
sql_scripts/update_2009_01_25_001.sql
sql_scripts/update_2009_02_26_001.sql
sql_scripts/update_2009_04_10_001.sql
templates/authopenid/confirm_email.txt
templates/authopenid/sendpw_email.txt
templates/content/js/compress.bat
templates/content/js/flot-build.bat
templates/content/style/style.css
templates/footer.html
templates/question.html
templates/user_reputation.html
templates/user_stats.html
templates/user_votes.html
templates/users_questions.html
urls.py
Diffstat (limited to 'templates/faq.html')
-rw-r--r-- | templates/faq.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/templates/faq.html b/templates/faq.html index aec37a56..236f4f76 100644 --- a/templates/faq.html +++ b/templates/faq.html @@ -72,10 +72,12 @@ <td style="text-align:right;padding-right:5px"><strong>500</strong></td> <td>{% trans "retag questions" %}</td> </tr> + {% if settings.WIKI_ON %} <tr> <td style="text-align:right;padding-right:5px"><strong>750</strong></td> <td>{% trans "edit community wiki questions" %}</td> </tr> + {% endif %} <tr> <td style="text-align:right;padding-right:5px"><strong>2000</strong></td> <td>{% trans "edit any answer" %}</td> @@ -99,7 +101,7 @@ <div> <a id='validate'></a><h3 class="subtitle">{% trans "how to validate email title" %}</h3> <!--special case here message must contain paragraphs--> - {% trans "how to validate email info" %} + {% blocktrans %}how to validate email info with {{send_email_key_url}} {{gravatar_faq_url}}{% endblocktrans %} </div> {% endifequal %} <div> @@ -121,7 +123,7 @@ </div> <div> <h3 class="subtitle">{% trans "Still have questions?" %}</h3> - <p>{% trans "Please ask your question, help make our community better!" %} + <p>{% blocktrans %}Please ask your question at {{ask_question_url}}, help make our community better!{% endblocktrans %} <!-- <a href="{% url tags %}faq" class="big">{{ settings.APP_TITLE }} {% trans "questions" %}</a>{% trans "." %} --> |