X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3ac9cb26acd9b7c5ba421dac123ba8f75b782bd2..891b9e3b7ecaedc9ac32bc941400a267c77482a0:/apps/catalogue/models.py diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index b760eccc2..ec225d4d9 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -138,7 +138,7 @@ class Book(models.Model): formats = [] if self.html_file: - formats.append(u'Czytaj online' % reverse('book_text', kwargs={'slug': self.slug})) + formats.append(u'%s' % (reverse('book_text', kwargs={'slug': self.slug}), _('Read online'))) if self.pdf_file: formats.append(u'PDF' % self.pdf_file.url) if self.odt_file: @@ -160,7 +160,8 @@ class Book(models.Model): def save(self, force_insert=False, force_update=False, reset_short_html=True): if reset_short_html: # Reset _short_html during save - self._short_html = '' + for key in filter(lambda x: x.startswith('_short_html'), self.__dict__): + self.key = '' book = super(Book, self).save(force_insert, force_update) @@ -218,7 +219,7 @@ class Book(models.Model): book_shelves = [] else: if not overwrite: - raise Book.AlreadyExists('Book %s already exists' % book_slug) + raise Book.AlreadyExists(_('Book %s already exists') % book_slug) # Save shelves for this book book_shelves = list(book.tags.filter(category='set')) @@ -261,7 +262,7 @@ class Book(models.Model): child_book.parent_number = n child_book.save() except Book.DoesNotExist, e: - raise Book.DoesNotExist(u'Book with slug = "%s" does not exist.' % slug) + raise Book.DoesNotExist(_('Book with slug = "%s" does not exist.') % slug) book_descendants = list(book.children.all()) while len(book_descendants) > 0: @@ -383,5 +384,4 @@ class BookStub(models.Model): class Meta: ordering = ('title',) verbose_name = _('book stub') - verbose_name_plural = _('book stubs') - + verbose_name_plural = _('book stubs') \ No newline at end of file