merge hernani > trunk

[osqa.git] / forum / registry.py

diff --git a/forum/registry.py b/forum/registry.py
index ff5a1157941eea91d21b19f5822fd89329bf6921..aedf5b0d1b0e1dbcc4d773ff8a4d4c3a021cfb87 100644 (file)
--- a/forum/registry.py
+++ b/forum/registry.py
@@ -1,12 +1,19 @@
-from forum.modules import ui
+from forum.modules import ui, get_modules_script
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 from django.template.defaultfilters import slugify
+from django.template import get_templatetags_modules
 from forum.templatetags.extra_tags import get_score_badge
 from forum.utils.html import cleanup_urls
 from forum import settings
 
 
+modules_template_tags = get_modules_script('templatetags')
+django_template_tags = get_templatetags_modules()
+
+for m in modules_template_tags:
+    django_template_tags.append(m.__name__)
+
 ui.register(ui.HEADER_LINKS,
             ui.Link(_('faq'), ui.Url('faq'), weight=400),
             ui.Link(_('about'), ui.Url('about'), weight=300),