Browse Source

Output format of Markdown parser is now configureable.

Ralfp 12 years ago
parent
commit
f69caf9a22
3 changed files with 8 additions and 2 deletions
  1. 3 0
      misago/settings_base.py
  2. 4 1
      misago/template/templatetags/django2jinja.py
  3. 1 1
      misago/users/models.py

+ 3 - 0
misago/settings_base.py

@@ -7,6 +7,9 @@ BOARD_ADDRESS = 'http://127.0.0.1:8000/'
 # Leave this setting empty
 ADMIN_PATH = ''
 
+# Default format of Misago generated HTML
+OUTPUT_FORMAT = 'html5'
+
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True

+ 4 - 1
misago/template/templatetags/django2jinja.py

@@ -2,6 +2,7 @@ from datetime import date, datetime, timedelta
 import math
 import urllib
 from coffin.template import Library
+from django.conf import settings
 from django.utils.dateformat import format, time_format
 from django.utils.timezone import is_aware, utc
 from django.utils.translation import pgettext, ungettext, ugettext as _
@@ -21,8 +22,10 @@ def query_string(**kwargs):
 
 
 @register.filter(name='markdown')
-def parse_markdown(value, format="html5"):
+def parse_markdown(value, format=None):
     import markdown
+    if not format:
+        format = settings.OUTPUT_FORMAT
     return markdown.markdown(value, safe_mode='escape', output_format=format)
 
 

+ 1 - 1
misago/users/models.py

@@ -285,7 +285,7 @@ class User(models.Model):
         self.signature_preparsed = ''
         if self.signature:
             import markdown
-            self.signature_preparsed = markdown.markdown(value, safe_mode='escape', output_format=format)
+            self.signature_preparsed = markdown.markdown(value, safe_mode='escape', output_format=settings.OUTPUT_FORMAT)
         
     def is_username_valid(self, e):
         try: