Reverts some changes in a previous commit.

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

diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html
index 9caf2bf52ef2285f7a3e4cb0a0fd1301257e6336..76eec6e2923469d760ee99fe02cb9b76812cdb45 100644 (file)
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -26,15 +26,19 @@
             var osqaSkin = '{{settings.OSQA_SKIN}}';
 
             var messages = {
-                'username': '{{ user.username }}',
-                'confirm': "{% trans "Are you sure?" %}",
-                'yes': "{% trans "Yes" %}",
-                'no': "{% trans "No" %}",
-                'message': "{% trans "Message:" %}",
-                'cancel': "{% trans "Cancel" %}",
-                'close': "{% trans "Close" %}",
-                'ok': "{% trans "Ok" %}",
-                'matching_tags_url': "{% url matching_tags %}",
+                username: '{{ user.username }}',
+                confirm: "{% trans "Are you sure?" %}",
+                yes: "{% trans "Yes" %}",
+                no: "{% trans "No" %}",
+                message: "{% trans "Message:" %}",
+                cancel: "{% trans "Cancel" %}",
+                close: "{% trans "Close" %}",
+                ok: "{% trans "Ok" %}",
+                matching_tags_url: "{% url matching_tags %}",
+                word: "{% trans "word" %}",
+                words: "{% trans "words" %}",
+                character: "{% trans "character" %}",
+                characters: "{% trans "characters" %}"
             }
         /* ]] */
         </script>
@@ -52,7 +56,7 @@
         </script>
         {% endif %}
         {% if settings.USE_CUSTOM_HEAD|or_preview:request %}
-            {{ settings.CUSTOM_HEAD|or_preview:request|safe }}
+            {{ settings.CUSTOM_HEAD|or_preview:request|markdown:"settingsparser" }}
         {% endif %}
         {% block forejs %}{% endblock %}
         <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch %}" title="{{ settings.APP_SHORT_NAME }} Search" />
@@ -71,7 +75,7 @@
         </div>
         {% if settings.USE_CUSTOM_HEADER|or_preview:request %}
             <div id="custom_header">
-                {{ settings.CUSTOM_HEADER|or_preview:request|markdown:"settingsparser" }}    
+                {{ settings.CUSTOM_HEADER|or_preview:request|safe }}
             </div>
         {% endif %}
         {% include "header.html" %}