fix #5: smiles break urlize
This commit is contained in:
parent
78d6a2cce2
commit
18abcb087a
3 changed files with 25 additions and 20 deletions
|
@ -1,6 +1,7 @@
|
|||
from datetime import datetime
|
||||
import os.path
|
||||
import random
|
||||
import re
|
||||
from HTMLParser import HTMLParser
|
||||
|
||||
from django.shortcuts import render_to_response
|
||||
|
@ -11,6 +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
|
||||
|
||||
|
||||
def render_to(template_path):
|
||||
|
@ -182,3 +184,23 @@ def urlize(data):
|
|||
parser.close()
|
||||
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'(?<!http):/').sub(settings.FORUM_EMOTION_HMM, data)
|
||||
data = re.compile(r':P').sub(settings.FORUM_EMOTION_TONGUE, data)
|
||||
data = re.compile(r':lol:').sub(settings.FORUM_EMOTION_LOL, data)
|
||||
data = re.compile(r':mad:').sub(settings.FORUM_EMOTION_MAD, data)
|
||||
data = re.compile(r':rolleyes:').sub(settings.FORUM_EMOTION_ROLL, data)
|
||||
data = re.compile(r':cool:').sub(settings.FORUM_EMOTION_COOL, data)
|
||||
return data
|
||||
|
||||
|
|
Reference in a new issue