move xml check to celery,

typo fix

diff --git a/apps/catalogue/tasks.py b/apps/catalogue/tasks.py
index e9b8cf9..3e23037 100644 (file)
--- a/apps/catalogue/tasks.py
+++ b/apps/catalogue/tasks.py
@@ -9,3 +9,12 @@ def refresh_by_pk(cls, pk):
 def refresh_instance(instance):
     refresh_by_pk.delay(type(instance), instance.pk)
 
 def refresh_instance(instance):
     refresh_by_pk.delay(type(instance), instance.pk)
 

+
+@task
+def publishable_error(book):
+    try:
+        book.assert_publishable()
+    except AssertionError, e:
+        return e
+    else:
+       return None

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 72cf63d..b6e4c40 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -27,6 +27,7 @@ from catalogue import forms
 from catalogue import helpers
 from catalogue.helpers import active_tab
 from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord
 from catalogue import helpers
 from catalogue.helpers import active_tab
 from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord

+from catalogue.tasks import publishable_error

 from catalogue import xml_tools
 
 #
 from catalogue import xml_tools
 
 #


@@ -240,6 +241,9 @@ def book(request, slug):
         form = forms.ReadonlyBookForm(instance=book)
         editable = False
 
         form = forms.ReadonlyBookForm(instance=book)
         editable = False
 

+    task = publishable_error.delay(book)
+    publish_error = t.wait()
+    publishable = publish_error is None

 
     try:
         book.assert_publishable()
 
     try:
         book.assert_publishable()


@@ -253,7 +257,7 @@ def book(request, slug):
     return direct_to_template(request, "catalogue/book_detail.html", extra_context={
         "book": book,
         "publishable": publishable,
     return direct_to_template(request, "catalogue/book_detail.html", extra_context={
         "book": book,
         "publishable": publishable,

-        "publishable_error": publishable_error,
+        "publishable_error": publish_error,

         "form": form,
         "editable": editable,
     })
         "form": form,
         "editable": editable,
     })

diff --git a/redakcja/locale/pl/LC_MESSAGES/django.mo b/redakcja/locale/pl/LC_MESSAGES/django.mo
index 5c3c072..7f35966 100644 (file)
Binary files a/redakcja/locale/pl/LC_MESSAGES/django.mo and b/redakcja/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/redakcja/locale/pl/LC_MESSAGES/django.po b/redakcja/locale/pl/LC_MESSAGES/django.po
index be86f7d..916f4db 100644 (file)
--- a/redakcja/locale/pl/LC_MESSAGES/django.po
+++ b/redakcja/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2011-10-14 17:05+0200\n"
-"PO-Revision-Date: 2011-10-14 17:12+0100\n"
+"POT-Creation-Date: 2011-10-18 11:18+0200\n"
+"PO-Revision-Date: 2011-10-18 11:19+0100\n"

 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"


@@ -44,7 +44,7 @@ msgid ""
 "Go to the <a href=\"/\">document list</a>\n"
 "or to <a href=\"%(m)s\">your page</a> instead."
 msgstr ""
 "Go to the <a href=\"/\">document list</a>\n"
 "or to <a href=\"%(m)s\">your page</a> instead."
 msgstr ""

-"Jeśli skierował Cię tu Redmine, zwróć uwagę, że nie służy on już do koordynowania prac redakcyjnych. Możesz za to przejśćdo <a href=\"/\">listy dokumentów</a>\n"
+"Jeśli skierował Cię tu Redmine, zwróć uwagę, że nie służy on już do koordynowania prac redakcyjnych. Możesz za to przejść do <a href=\"/\">listy dokumentów</a>\n"

 "albo do <a href=\"%(m)s\">swojej strony</a>."
 
 #: templates/base.html:7
 "albo do <a href=\"%(m)s\">swojej strony</a>."
 
 #: templates/base.html:7