diff options
Diffstat (limited to 'app/lib/django_comments/models.py')
| -rw-r--r-- | app/lib/django_comments/models.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/lib/django_comments/models.py b/app/lib/django_comments/models.py index 78ce8b8..6ba1f30 100644 --- a/app/lib/django_comments/models.py +++ b/app/lib/django_comments/models.py @@ -1,5 +1,8 @@ from django.conf import settings -from django.contrib.contenttypes.fields import GenericForeignKey +try: + from django.contrib.contenttypes.fields import GenericForeignKey +except ImportError: + from django.contrib.contenttypes.generic import GenericForeignKey from django.contrib.contenttypes.models import ContentType from django.contrib.sites.models import Site from django.core import urlresolvers @@ -79,7 +82,6 @@ class Comment(BaseCommentAbstractModel): permissions = [("can_moderate", "Can moderate comments")] verbose_name = _('comment') verbose_name_plural = _('comments') - app_label = _('comment') def __str__(self): return "%s: %s..." % (self.name, self.comment[:50]) @@ -191,7 +193,6 @@ class CommentFlag(models.Model): unique_together = [('user', 'comment', 'flag')] verbose_name = _('comment flag') verbose_name_plural = _('comment flags') - app_label = _('commentflag') def __str__(self): return "%s flag of comment ID %s by %s" % \ |