X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f9c19bbcbc514aebcff44b37ca5b92b4a0e181cf..02f8116c468682e76e7d7d81ab345c92d8188152:/src/dvcs/models.py?ds=inline diff --git a/src/dvcs/models.py b/src/dvcs/models.py index ed771c43..5d7d7ff1 100644 --- a/src/dvcs/models.py +++ b/src/dvcs/models.py @@ -11,7 +11,7 @@ from django.core.files.storage import FileSystemStorage 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 @@ -86,7 +86,7 @@ class Change(models.Model): description = models.TextField(_('description'), blank=True, default='') created_at = models.DateTimeField(editable=False, db_index=True, default=datetime.now) - publishable = models.BooleanField(_('publishable'), default=False) + publishable = models.BooleanField(_('approved'), default=False) class Meta: abstract = True @@ -94,7 +94,7 @@ class Change(models.Model): 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: