diff --git a/apps/forum/util.py b/apps/forum/util.py index 9fa4944..70524b7 100644 --- a/apps/forum/util.py +++ b/apps/forum/util.py @@ -12,7 +12,7 @@ from django.utils.translation import force_unicode from django.utils.simplejson import JSONEncoder from django import forms from django.template.defaultfilters import urlize as django_urlize -from django.conf import settings +from apps.forum import settings as forum_settings def render_to(template_path): @@ -185,22 +185,23 @@ def urlize(data): return urlized_html def smiles(data): - data = re.compile(r':\)').sub(settings.FORUM_EMOTION_SMILE, data) - data = re.compile(r'=\)').sub(settings.FORUM_EMOTION_SMILE, data) - data = re.compile(r':\|').sub(settings.FORUM_EMOTION_NEUTRAL, data) - data = re.compile(r'=\|').sub(settings.FORUM_EMOTION_NEUTRAL, data) - data = re.compile(r':\(').sub(settings.FORUM_EMOTION_SAD, data) - data = re.compile(r'=\(').sub(settings.FORUM_EMOTION_SAD, data) - data = re.compile(r':D').sub(settings.FORUM_EMOTION_BIG_SMILE, data) - data = re.compile(r'=D').sub(settings.FORUM_EMOTION_BIG_SMILE, data) - data = re.compile(r':o').sub(settings.FORUM_EMOTION_YIKES, data) - data = re.compile(r':O').sub(settings.FORUM_EMOTION_YIKES, data) - data = re.compile(r';\)').sub(settings.FORUM_EMOTION_WINK, data) - data = re.compile(r'(?