summaryrefslogtreecommitdiffstats
path: root/templates/faq.html
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-16 17:05:27 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-16 17:05:27 -0600
commita32975a5d8acf5fa54f544271e2cfb9e92bbf8bf (patch)
tree5bf13b5605e40c755e20edf9be45e3a20308d5dd /templates/faq.html
parentfa30dc90be82aa0f818e14110e9b86373f7c8a35 (diff)
parentf15cb4dc7d9284a24f75dc8b56248916140ceb09 (diff)
downloadaskbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.tar.gz
askbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.tar.bz2
askbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.zip
Merge branch 'evgenyfadeev/master'
Conflicts: locale/en/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po
Diffstat (limited to 'templates/faq.html')
-rw-r--r--templates/faq.html14
1 files changed, 4 insertions, 10 deletions
diff --git a/templates/faq.html b/templates/faq.html
index 7e99ae7f..aec37a56 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -25,7 +25,7 @@
<div>
<h3 class="subtitle">{% trans "What should I avoid in my answers?" %}</h3>
- <p>{% trans "site title" %} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %}</p>
+ <p>{{ settings.APP_TITLE }} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %}</p>
</div>
<div>
@@ -39,13 +39,7 @@
<div>
<h3 class="subtitle">{% trans "How does reputation system work?" %}</h3>
<p>{% trans "Rep system summary" %}</p>
- <p>
- For example, if you ask an interesting question or give a helpful answer, your input will be upvoted.
- On the other hand if the answer is misleading - it will be downvoted.
- Each vote in favor will generate <strong>10</strong> points, each vote against will subtract <strong>2</strong> points.
- There is a limit of <strong>200</strong> points that can be accumulated per question or answer.
-
- The table below explains reputation point requirements for each type of moderation task.
+ <p>{% blocktrans %}For example, if you ask an interesting question or give a helpful answer, your input will be upvoted. On the other hand if the answer is misleading - it will be downvoted. Each vote in favor will generate <strong>10</strong> points, each vote against will subtract <strong>2</strong> points. There is a limit of <strong>200</strong> points that can be accumulated per question or answer. The table below explains reputation point requirements for each type of moderation task.{% endblocktrans %}
</p>
<table style="font-family:arial;" cellspacing="3" cellpadding="3">
@@ -115,7 +109,7 @@
<div>
<h3 class="subtitle">{% trans "To register, do I need to create new password?" %}</h3>
<p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %}
- <strong><a href="/account/signin">{% trans "Login now!" %}</a> »</strong>
+ <strong><a href="{% url user_signin %}">{% trans "Login now!" %}</a> »</strong>
</p>
</div>
@@ -129,7 +123,7 @@
<h3 class="subtitle">{% trans "Still have questions?" %}</h3>
<p>{% trans "Please ask your question, help make our community better!" %}
<!--
- <a href="/tags/faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
+ <a href="{% url tags %}faq" class="big">{{ settings.APP_TITLE }} {% trans "questions" %}</a>{% trans "." %}
-->
</p>
</div>