Rename publishable to approved, add profile option to approve by default.

[redakcja.git] / src / documents / models / image.py

diff --git a/src/documents/models/image.py b/src/documents/models/image.py
index 10782dc..c14cca0 100644 (file)
--- a/src/documents/models/image.py
+++ b/src/documents/models/image.py
@@ -6,7 +6,7 @@ from django.contrib.sites.models import Site
 from django.db import models
 from django.template.loader import render_to_string
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from documents.helpers import cached_in_field
 from documents.models import Project
 from dvcs import models as dvcs_models
@@ -23,9 +23,9 @@ class Image(dvcs_models.Document):
     project = models.ForeignKey(Project, models.SET_NULL, null=True, blank=True)
 
     # cache
-    _new_publishable = models.NullBooleanField(editable=False)
-    _published = models.NullBooleanField(editable=False)
-    _changed = models.NullBooleanField(editable=False)
+    _new_publishable = models.BooleanField(editable=False, null=True)
+    _published = models.BooleanField(editable=False, null=True)
+    _changed = models.BooleanField(editable=False, null=True)
 
     class Meta:
         app_label = 'documents'
@@ -72,7 +72,7 @@ class Image(dvcs_models.Document):
                 return open(self.image.path)
 
         publishable = self.publishable()
-        assert publishable, _("There is no publishable revision")
+        assert publishable, _("There is no approved revision")
         picture_xml = publishable.materialize()
 
         try: