X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/f96d09230c37fd7a81b3495bdfee83cd831475c9..c6c168511f18d8984901b2c828a47310a2d54d64:/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 9caf2bf..2281f0e 100644
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -22,19 +22,23 @@
         <script type="text/javascript">
         /* <![CDATA[ */
             var i18nLang = '{{settings.LANGUAGE_CODE}}';
-            var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
+            var scriptUrl = '{{settings.FORCE_SCRIPT_NAME}}/'
             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>
@@ -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|static_content:settings.CUSTOM_HEADER_RENDER_MODE }}
             </div>
         {% endif %}
         {% include "header.html" %}
@@ -94,19 +98,19 @@
         {% if settings.USE_CUSTOM_FOOTER|or_preview:request %}
             {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "above" %}
                 <div id="custom_footer">
-                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|static_content:settings.CUSTOM_FOOTER_RENDER_MODE }}
                 </div>
             {% endifequal %}
             <div id="ground">
                 {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "replace" %}
-                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|static_content:settings.CUSTOM_FOOTER_RENDER_MODE }}
                 {% else %}
                     {% include "footer.html" %}
                 {% endifequal %}
             </div>
             {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "below" %}
                 <div id="custom_footer">
-                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|static_content:settings.CUSTOM_FOOTER_RENDER_MODE }}
                 </div>
             {% endifequal %}
         {% else %}