Fixes OSQA 317, Wrong links in the user profile in the new notification email, and...

[osqa.git] / forum / skins / default / templates / question_edit_tips.html

diff --git a/forum/skins/default/templates/question_edit_tips.html b/forum/skins/default/templates/question_edit_tips.html
index a391ecad8601c3c7087ead61845642755aa1ac56..cd94876b1b2d3039a18ef4c3ea70b038a31ed641 100644 (file)
--- a/forum/skins/default/templates/question_edit_tips.html
+++ b/forum/skins/default/templates/question_edit_tips.html
@@ -52,24 +52,27 @@
         </li>
     </ul>
     <p class='info-box-follow-up-links'>
-        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans "learn more about Markdown" %} </a>
+        <a href="{% url markdown_help %}" target="_blank">{% trans "learn more about Markdown" %} </a>
     </p>
 </div>
 
 <div class="boxC" id="tags_side_bar" align="left">
-    <p class="subtitle darkred">{% trans "What Are Tabs" %}</p>
+    <p class="subtitle darkred">{% trans "What Are Tags" %}</p>
     <ul class="list-item">
         <li>
-            {% trans "Tags are words that will tell others what this question proteins to." %}
+            {% trans "Tags are words that will tell others what this question is about." %}
         </li>
         <li>
             {% trans "They will help other find your question." %}
         </li>
         <li>
-            {% trans "A question can have up to five tags but it must have at less one." %}
+            {% blocktrans with settings.FORM_MAX_NUMBER_OF_TAGS as max_number_of_tags and settings.FORM_MIN_NUMBER_OF_TAGS as min_number_of_tags %}
+                A question can have up to {{max_number_of_tags}} tags, but it must have at least {{min_number_of_tags}}.
+            {% endblocktrans %}
         </li>
     </ul>
 </div>
 
 
-<!-- end question_edit_tips.html -->
+<!-- end question_edit_tips.html  -->
+                                  
\ No newline at end of file