from django.db import models, transaction
from django.db.models.base import ModelBase
from django.utils.text import format_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
import merge3
from django.conf import settings
unique_together = ['tree', 'revision']
def __str__(self):
- return u"Id: %r, Tree %r, Parent %r, Data: %s" % (self.id, self.tree_id, self.parent_id, self.data)
+ return "rev. {} @ {}".format(self.revision, self.created_at)
def author_str(self):
if self.author: