projects
/
matthijs
/
projects
/
xerxes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the rewrap function for wrapping comments.
[matthijs/projects/xerxes.git]
/
influences
/
models.py
diff --git
a/influences/models.py
b/influences/models.py
index 198b0318aa77e63f614618bc50025bad94d46156..78daa15992304ee33882f4da9922ee38a930f3c7 100644
(file)
--- a/
influences/models.py
+++ b/
influences/models.py
@@
-1,8
+1,10
@@
from django.db import models
from django.core.urlresolvers import reverse
from django.contrib.auth.models import User
from django.db import models
from django.core.urlresolvers import reverse
from django.contrib.auth.models import User
+from django.utils.text import normalize_newlines
from django.utils.translation import ugettext_lazy as _
from threadedcomments.models import ThreadedComment
from django.utils.translation import ugettext_lazy as _
from threadedcomments.models import ThreadedComment
+from xerxes.tools.text import rewrap
# Create your models here.
class Character(models.Model):
# Create your models here.
class Character(models.Model):
@@
-60,7
+62,9
@@
class Influence(models.Model):
If private is True, private comments are included in this list.
"""
def quote_reply(comment):
If private is True, private comments are included in this list.
"""
def quote_reply(comment):
- return "\n".join(["> " + l for l in comment.comment.split("\n")])
+ regex = "^([ >]*)(.*)$"
+ text = rewrap(normalize_newlines(comment.comment), 72, regex)
+ return "\n".join(["> " + l for l in text.split("\n")])
# Import here to prevent dependency loop, since forms depends on
# models as well
# Import here to prevent dependency loop, since forms depends on
# models as well