From: Radek Czajka Date: Wed, 22 Sep 2010 11:58:00 +0000 (+0200) Subject: fixes #529: daisy X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/4e7302190468a80e5cd558cc4c73985b16153e0a?ds=inline;hp=--cc fixes #529: daisy --- 4e7302190468a80e5cd558cc4c73985b16153e0a diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py index 3aceb4f86..3ce88f417 100644 --- a/apps/catalogue/forms.py +++ b/apps/catalogue/forms.py @@ -73,6 +73,7 @@ FORMATS = ( ('odt', 'ODT'), ('txt', 'TXT'), ('epub', 'EPUB'), + ('daisy', 'DAISY'), ) diff --git a/apps/catalogue/locale/de/LC_MESSAGES/django.mo b/apps/catalogue/locale/de/LC_MESSAGES/django.mo index 3e56cd153..826a679d3 100644 Binary files a/apps/catalogue/locale/de/LC_MESSAGES/django.mo and b/apps/catalogue/locale/de/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/de/LC_MESSAGES/django.po b/apps/catalogue/locale/de/LC_MESSAGES/django.po index 575defb5f..478957a87 100644 --- a/apps/catalogue/locale/de/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/de/LC_MESSAGES/django.po @@ -157,6 +157,9 @@ msgstr "MP3-Datei" msgid "OGG file" msgstr "OGG-Datei" +msgid "DAISY file" +msgstr "DAISY-Datei" + #: models.py:205 msgid "books" msgstr "Bücher" diff --git a/apps/catalogue/locale/en/LC_MESSAGES/django.mo b/apps/catalogue/locale/en/LC_MESSAGES/django.mo index 45ddee8f4..7f2b75008 100644 Binary files a/apps/catalogue/locale/en/LC_MESSAGES/django.mo and b/apps/catalogue/locale/en/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/en/LC_MESSAGES/django.po b/apps/catalogue/locale/en/LC_MESSAGES/django.po index fe91865df..377c61d0c 100644 --- a/apps/catalogue/locale/en/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/en/LC_MESSAGES/django.po @@ -157,6 +157,9 @@ msgstr "MP3 file" msgid "OGG file" msgstr "OGG file" +msgid "DAISY file" +msgstr "DAISY file" + #: models.py:205 msgid "books" msgstr "Books" diff --git a/apps/catalogue/locale/es/LC_MESSAGES/django.mo b/apps/catalogue/locale/es/LC_MESSAGES/django.mo index 8f94d47d7..ea037e041 100644 Binary files a/apps/catalogue/locale/es/LC_MESSAGES/django.mo and b/apps/catalogue/locale/es/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/es/LC_MESSAGES/django.po b/apps/catalogue/locale/es/LC_MESSAGES/django.po index c105555b6..9549167ba 100644 --- a/apps/catalogue/locale/es/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/es/LC_MESSAGES/django.po @@ -157,6 +157,9 @@ msgstr "archivo MP3" msgid "OGG file" msgstr "archivo OGG" +msgid "DAISY file" +msgstr "archivo DAISY" + #: models.py:205 msgid "books" msgstr "libros" diff --git a/apps/catalogue/locale/fr/LC_MESSAGES/django.mo b/apps/catalogue/locale/fr/LC_MESSAGES/django.mo index 9f0caac13..a21094783 100644 Binary files a/apps/catalogue/locale/fr/LC_MESSAGES/django.mo and b/apps/catalogue/locale/fr/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/fr/LC_MESSAGES/django.po b/apps/catalogue/locale/fr/LC_MESSAGES/django.po index 1fb3e64f6..0148a6579 100644 --- a/apps/catalogue/locale/fr/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/fr/LC_MESSAGES/django.po @@ -180,6 +180,9 @@ msgstr "fichier MP3" msgid "OGG file" msgstr "fichier OGG" +msgid "DAISY file" +msgstr "fichier DAISY" + #: models.py:141 msgid "Read online" msgstr "Lire en ligne" diff --git a/apps/catalogue/locale/lt/LC_MESSAGES/django.mo b/apps/catalogue/locale/lt/LC_MESSAGES/django.mo index 602cf55e5..0569994ad 100644 Binary files a/apps/catalogue/locale/lt/LC_MESSAGES/django.mo and b/apps/catalogue/locale/lt/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/lt/LC_MESSAGES/django.po b/apps/catalogue/locale/lt/LC_MESSAGES/django.po index 03f79a58b..8be75f1c2 100644 --- a/apps/catalogue/locale/lt/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/lt/LC_MESSAGES/django.po @@ -138,9 +138,8 @@ msgid "PDF file" msgstr "PDF failas" #: models.py:184 -#, fuzzy msgid "EPUB file" -msgstr "PDF failas" +msgstr "EPUB failas" #: models.py:185 msgid "ODT file" @@ -158,6 +157,9 @@ msgstr "MP3 failas" msgid "OGG file" msgstr "OGG failas" +msgid "DAISY file" +msgstr "DAISY failas" + #: models.py:205 msgid "books" msgstr "knygos" diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo index e138c2a8e..ad006b5c1 100644 Binary files a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo and b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.po b/apps/catalogue/locale/pl/LC_MESSAGES/django.po index 0fcfc61bd..dad6afb21 100644 --- a/apps/catalogue/locale/pl/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/pl/LC_MESSAGES/django.po @@ -157,6 +157,9 @@ msgstr "Plik MP3" msgid "OGG file" msgstr "Plik OGG" +msgid "DAISY file" +msgstr "Plik DAISY" + #: models.py:205 msgid "books" msgstr "książki" diff --git a/apps/catalogue/locale/ru/LC_MESSAGES/django.mo b/apps/catalogue/locale/ru/LC_MESSAGES/django.mo index ed1bfbe7d..410239a0e 100644 Binary files a/apps/catalogue/locale/ru/LC_MESSAGES/django.mo and b/apps/catalogue/locale/ru/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/ru/LC_MESSAGES/django.po b/apps/catalogue/locale/ru/LC_MESSAGES/django.po index 9652781ad..c1d715b51 100644 --- a/apps/catalogue/locale/ru/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/ru/LC_MESSAGES/django.po @@ -157,6 +157,9 @@ msgstr "MP3 файл" msgid "OGG file" msgstr "OGG файл" +msgid "DAISY file" +msgstr "DAISY файл" + #: models.py:205 msgid "books" msgstr "книги" diff --git a/apps/catalogue/locale/uk/LC_MESSAGES/django.mo b/apps/catalogue/locale/uk/LC_MESSAGES/django.mo index 094605f3d..e6df390fa 100644 Binary files a/apps/catalogue/locale/uk/LC_MESSAGES/django.mo and b/apps/catalogue/locale/uk/LC_MESSAGES/django.mo differ diff --git a/apps/catalogue/locale/uk/LC_MESSAGES/django.po b/apps/catalogue/locale/uk/LC_MESSAGES/django.po index 457f7d93f..8102b652b 100644 --- a/apps/catalogue/locale/uk/LC_MESSAGES/django.po +++ b/apps/catalogue/locale/uk/LC_MESSAGES/django.po @@ -139,7 +139,7 @@ msgstr "файл PDF" #: models.py:184 msgid "EPUB file" -msgstr "" +msgstr "файл EPUB" #: models.py:185 msgid "ODT file" @@ -157,6 +157,8 @@ msgstr "файл MP3" msgid "OGG file" msgstr "файл OGG" +msgid "DAISY file" +msgstr "файл DAISY" #: models.py:263 msgid "Read online" diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py index ee469ba9b..ffe0de8ec 100644 --- a/apps/catalogue/management/commands/importbooks.py +++ b/apps/catalogue/management/commands/importbooks.py @@ -87,6 +87,10 @@ class Command(BaseCommand): book.ogg_file.save('%s.ogg' % book.slug, File(file(os.path.join(dir_name, book.slug + '.ogg')))) if verbose: print "Importing %s.ogg" % book.slug + if os.path.isfile(os.path.join(dir_name, book.slug + '.daisy.zip')): + book.ogg_file.save('%s.daisy.zip' % book.slug, File(file(os.path.join(dir_name, book.slug + '.daisy.zip')))) + if verbose: + print "Importing %s.daisy.zip" % book.slug book.save() diff --git a/apps/catalogue/migrations/0002_auto__add_field_book_daisy_file.py b/apps/catalogue/migrations/0002_auto__add_field_book_daisy_file.py new file mode 100644 index 000000000..8f5c088ed --- /dev/null +++ b/apps/catalogue/migrations/0002_auto__add_field_book_daisy_file.py @@ -0,0 +1,150 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding field 'Book.daisy_file' + db.add_column('catalogue_book', 'daisy_file', self.gf('django.db.models.fields.files.FileField')(default='', max_length=100, blank=True), keep_default=False) + + + def backwards(self, orm): + + # Deleting field 'Book.daisy_file' + db.delete_column('catalogue_book', 'daisy_file') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'catalogue.book': { + 'Meta': {'ordering': "('title',)", 'object_name': 'Book'}, + '_short_html': ('django.db.models.fields.TextField', [], {}), + '_short_html_de': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_en': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_es': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_fr': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_lt': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_pl': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_ru': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_uk': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_tag_counter': ('catalogue.fields.JSONField', [], {'null': 'True'}), + '_theme_counter': ('catalogue.fields.JSONField', [], {'null': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'daisy_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'epub_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'extra_info': ('catalogue.fields.JSONField', [], {}), + 'gazeta_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}), + 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mp3_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'odt_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'ogg_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['catalogue.Book']"}), + 'parent_number': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'pdf_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '120', 'db_index': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '120'}), + 'txt_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'wiki_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}), + 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}) + }, + 'catalogue.bookstub': { + 'Meta': {'ordering': "('title',)", 'object_name': 'BookStub'}, + 'author': ('django.db.models.fields.CharField', [], {'max_length': '120'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'pd': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '120', 'db_index': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '120'}), + 'translator': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'translator_death': ('django.db.models.fields.TextField', [], {'blank': 'True'}) + }, + 'catalogue.filerecord': { + 'Meta': {'ordering': "('-time', '-slug', '-type')", 'object_name': 'FileRecord'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'db_index': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '20', 'db_index': 'True'}) + }, + 'catalogue.fragment': { + 'Meta': {'ordering': "('book', 'anchor')", 'object_name': 'Fragment'}, + '_short_html': ('django.db.models.fields.TextField', [], {}), + '_short_html_de': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_en': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_es': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_fr': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_lt': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_pl': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_ru': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_uk': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + 'anchor': ('django.db.models.fields.CharField', [], {'max_length': '120'}), + 'book': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'fragments'", 'to': "orm['catalogue.Book']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'short_text': ('django.db.models.fields.TextField', [], {}), + 'text': ('django.db.models.fields.TextField', [], {}) + }, + 'catalogue.tag': { + 'Meta': {'ordering': "('sort_key',)", 'unique_together': "(('slug', 'category'),)", 'object_name': 'Tag'}, + 'book_count': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'category': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), + 'death': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'gazeta_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'main_page': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'db_index': 'True'}), + 'sort_key': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'db_index': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'wiki_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}) + }, + 'catalogue.tagrelation': { + 'Meta': {'unique_together': "(('tag', 'content_type', 'object_id'),)", 'object_name': 'TagRelation', 'db_table': "'catalogue_tag_relation'"}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'items'", 'to': "orm['catalogue.Tag']"}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['catalogue'] diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index d3b24d379..6863b2a40 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -186,6 +186,7 @@ class Book(models.Model): txt_file = models.FileField(_('TXT file'), upload_to=book_upload_path('txt'), blank=True) mp3_file = models.FileField(_('MP3 file'), upload_to=book_upload_path('mp3'), blank=True) ogg_file = models.FileField(_('OGG file'), upload_to=book_upload_path('ogg'), blank=True) + daisy_file = models.FileField(_('DAISY file'), upload_to=book_upload_path('daisy.zip'), blank=True) parent = models.ForeignKey('self', blank=True, null=True, related_name='children') @@ -273,6 +274,8 @@ class Book(models.Model): formats.append(u'MP3' % self.mp3_file.url) if self.ogg_file: formats.append(u'OGG' % self.ogg_file.url) + if self.daisy_file: + formats.append(u'DAISY' % self.daisy_file.url) formats = [mark_safe(format) for format in formats] diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 1180ab2fd..aa3e3c662 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -534,7 +534,7 @@ def download_shelf(request, slug): if form.is_valid(): formats = form.cleaned_data['formats'] if len(formats) == 0: - formats = ['pdf', 'epub', 'odt', 'txt', 'mp3', 'ogg'] + formats = ['pdf', 'epub', 'odt', 'txt', 'mp3', 'ogg', 'daisy'] # Create a ZIP archive temp = tempfile.TemporaryFile() @@ -561,6 +561,9 @@ def download_shelf(request, slug): if 'ogg' in formats and book.ogg_file: filename = book.ogg_file.path archive.write(filename, str('%s.ogg' % book.slug)) + if 'daisy' in formats and book.daisy_file: + filename = book.daisy_file.path + archive.write(filename, str('%s.daisy.zip' % book.slug)) archive.close() response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed') @@ -579,7 +582,7 @@ def shelf_book_formats(request, shelf): """ shelf = get_object_or_404(models.Tag, slug=shelf, category='set') - formats = {'pdf': False, 'epub': False, 'odt': False, 'txt': False, 'mp3': False, 'ogg': False} + formats = {'pdf': False, 'epub': False, 'odt': False, 'txt': False, 'mp3': False, 'ogg': False, 'daisy': False} for book in collect_books(models.Book.tagged.with_all(shelf)): if book.pdf_file: @@ -594,6 +597,8 @@ def shelf_book_formats(request, shelf): formats['mp3'] = True if book.ogg_file: formats['ogg'] = True + if book.daisy_file: + formats['daisy'] = True return HttpResponse(LazyEncoder().encode(formats)) diff --git a/wolnelektury/locale/de/LC_MESSAGES/django.mo b/wolnelektury/locale/de/LC_MESSAGES/django.mo index 147a86e75..c146fa864 100644 Binary files a/wolnelektury/locale/de/LC_MESSAGES/django.mo and b/wolnelektury/locale/de/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/de/LC_MESSAGES/django.po b/wolnelektury/locale/de/LC_MESSAGES/django.po index ea4e22394..5eeebb83e 100644 --- a/wolnelektury/locale/de/LC_MESSAGES/django.po +++ b/wolnelektury/locale/de/LC_MESSAGES/django.po @@ -232,6 +232,9 @@ msgstr "MP3-Datei herunterladen" msgid "Download Ogg Vorbis" msgstr "Ogg Vorbis-Datei herunterladen" +msgid "Download DAISY" +msgstr "DAISY-Datei herunterladen" + #: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "Details" diff --git a/wolnelektury/locale/es/LC_MESSAGES/django.mo b/wolnelektury/locale/es/LC_MESSAGES/django.mo index be4d3ec84..d9746c8b6 100644 Binary files a/wolnelektury/locale/es/LC_MESSAGES/django.mo and b/wolnelektury/locale/es/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/es/LC_MESSAGES/django.po b/wolnelektury/locale/es/LC_MESSAGES/django.po index 4b8669bc4..007c70028 100644 --- a/wolnelektury/locale/es/LC_MESSAGES/django.po +++ b/wolnelektury/locale/es/LC_MESSAGES/django.po @@ -232,6 +232,9 @@ msgstr "Descargar MP3" msgid "Download Ogg Vorbis" msgstr "Descargar Ogg Vorbis" +msgid "Download DAISY" +msgstr "Descargar DAISY" + #: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "Detalles" diff --git a/wolnelektury/locale/fr/LC_MESSAGES/django.mo b/wolnelektury/locale/fr/LC_MESSAGES/django.mo index 6c5c6ca56..98276898c 100644 Binary files a/wolnelektury/locale/fr/LC_MESSAGES/django.mo and b/wolnelektury/locale/fr/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/fr/LC_MESSAGES/django.po b/wolnelektury/locale/fr/LC_MESSAGES/django.po index 49f94ba78..5e07ee319 100644 --- a/wolnelektury/locale/fr/LC_MESSAGES/django.po +++ b/wolnelektury/locale/fr/LC_MESSAGES/django.po @@ -284,6 +284,9 @@ msgstr "Télécharger un fichier MP3" msgid "Download Ogg Vorbis" msgstr "Télécharger un fichier Ogg Vorbis" +msgid "Download DAISY" +msgstr "Télécharger un fichier DAISY" + #: templates/catalogue/book_detail.html:79 msgid "Details" msgstr "Détails" diff --git a/wolnelektury/locale/lt/LC_MESSAGES/django.mo b/wolnelektury/locale/lt/LC_MESSAGES/django.mo index 301573f01..0ea45ba78 100644 Binary files a/wolnelektury/locale/lt/LC_MESSAGES/django.mo and b/wolnelektury/locale/lt/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/lt/LC_MESSAGES/django.po b/wolnelektury/locale/lt/LC_MESSAGES/django.po index 42e20f17a..d824c5131 100644 --- a/wolnelektury/locale/lt/LC_MESSAGES/django.po +++ b/wolnelektury/locale/lt/LC_MESSAGES/django.po @@ -231,6 +231,9 @@ msgstr "atsisiųsk MP3 failą" msgid "Download Ogg Vorbis" msgstr "atsisiųsk Ogg Vorbis failą" +msgid "Download DAISY" +msgstr "atsisiųsk DAISY failą" + #: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "detalės " diff --git a/wolnelektury/locale/pl/LC_MESSAGES/django.mo b/wolnelektury/locale/pl/LC_MESSAGES/django.mo index c848180f3..b4e684789 100644 Binary files a/wolnelektury/locale/pl/LC_MESSAGES/django.mo and b/wolnelektury/locale/pl/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/pl/LC_MESSAGES/django.po b/wolnelektury/locale/pl/LC_MESSAGES/django.po index b40d3d5bb..6c88230f7 100644 --- a/wolnelektury/locale/pl/LC_MESSAGES/django.po +++ b/wolnelektury/locale/pl/LC_MESSAGES/django.po @@ -255,6 +255,9 @@ msgstr "Pobierz plik MP3" msgid "Download Ogg Vorbis" msgstr "Pobierz plik Ogg Vorbis" +msgid "Download DAISY" +msgstr "Pobierz plik DAISY" + #: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "O utworze" diff --git a/wolnelektury/locale/ru/LC_MESSAGES/django.mo b/wolnelektury/locale/ru/LC_MESSAGES/django.mo index d79768d9b..c8642b82d 100644 Binary files a/wolnelektury/locale/ru/LC_MESSAGES/django.mo and b/wolnelektury/locale/ru/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/ru/LC_MESSAGES/django.po b/wolnelektury/locale/ru/LC_MESSAGES/django.po index c94d6385d..f784b9f2c 100644 --- a/wolnelektury/locale/ru/LC_MESSAGES/django.po +++ b/wolnelektury/locale/ru/LC_MESSAGES/django.po @@ -232,6 +232,9 @@ msgstr "скачать MP3" msgid "Download Ogg Vorbis" msgstr "Скачать Ogg Vorbis" +msgid "Download DAISY" +msgstr "Скачать DAISY" + #: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "Подробнее" diff --git a/wolnelektury/locale/uk/LC_MESSAGES/django.mo b/wolnelektury/locale/uk/LC_MESSAGES/django.mo index e2330c36c..0453c42dd 100644 Binary files a/wolnelektury/locale/uk/LC_MESSAGES/django.mo and b/wolnelektury/locale/uk/LC_MESSAGES/django.mo differ diff --git a/wolnelektury/locale/uk/LC_MESSAGES/django.po b/wolnelektury/locale/uk/LC_MESSAGES/django.po index 3202f5d10..09888f2b7 100644 --- a/wolnelektury/locale/uk/LC_MESSAGES/django.po +++ b/wolnelektury/locale/uk/LC_MESSAGES/django.po @@ -259,6 +259,9 @@ msgstr "Завантажити MP3" msgid "Download Ogg Vorbis" msgstr "Завантажити Ogg Vorbis" +msgid "Download DAISY" +msgstr "Завантажити DAISY" + #: templates/catalogue/book_detail.html:95 msgid "Details" msgstr "Подробиці" diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html index fed2d5b26..0158eb86a 100644 --- a/wolnelektury/templates/catalogue/book_detail.html +++ b/wolnelektury/templates/catalogue/book_detail.html @@ -66,6 +66,7 @@ {% endif %} {% if book.mp3_file %}{% trans "Download MP3" %}{% endif %} {% if book.ogg_file %}{% trans "Download Ogg Vorbis" %}{% endif %} + {% if book.daisy_file %}{% trans "Download DAISY" %}{% endif %} {% if book.mp3_file %} diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html index 73bdf0a6c..2a1a64f3f 100644 --- a/wolnelektury/templates/catalogue/tagged_object_list.html +++ b/wolnelektury/templates/catalogue/tagged_object_list.html @@ -40,6 +40,7 @@
  • {% trans "for reading" %} {% trans "on small displays, for example mobile phones" %}
  • {% trans "for listening" %} {% trans "on favourite MP3 player" %}
  • {% trans "for listening" %} — {% trans "open format" %} {% trans "Xiph.org Foundation" %}
    • +
  • {% trans "Updating list of books' formats on the shelf" %}