fix

[wolnelektury.git] / src / catalogue / constants.py

diff --git a/src/catalogue/constants.py b/src/catalogue/constants.py
index 60ceceb..6ee7c97 100644 (file)
--- a/src/catalogue/constants.py
+++ b/src/catalogue/constants.py
@@ -1,23 +1,25 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 LICENSES = {
     'http://creativecommons.org/licenses/by-sa/3.0/': {
         'icon': 'cc-by-sa',
         'description': _('Creative Commons Attribution-ShareAlike 3.0 Unported'),
 
 LICENSES = {
     'http://creativecommons.org/licenses/by-sa/3.0/': {
         'icon': 'cc-by-sa',
         'description': _('Creative Commons Attribution-ShareAlike 3.0 Unported'),

+        'locative': 'licencji CC-BY-SA 3.0 PL',

     },
     'http://artlibre.org/licence/lal/pl/': {
         'icon': 'lal',
         'description': _('Free Art License 1.3'),
     },
     'http://artlibre.org/licence/lal/pl/': {
         'icon': 'lal',
         'description': _('Free Art License 1.3'),

+        'locative': 'Licencji Wolnej Sztuki 1.3',

     }
 }
 LICENSES['http://creativecommons.org/licenses/by-sa/3.0/deed.pl'] = \
     LICENSES['http://creativecommons.org/licenses/by-sa/3.0/']
 
     }
 }
 LICENSES['http://creativecommons.org/licenses/by-sa/3.0/deed.pl'] = \
     LICENSES['http://creativecommons.org/licenses/by-sa/3.0/']
 

-for license, data in LICENSES.items():
+
+for license, data in list(LICENSES.items()):

     LICENSES[license.replace('http://', 'https://')] = data
 
 # Those will be generated only for books with own HTML.
     LICENSES[license.replace('http://', 'https://')] = data
 
 # Those will be generated only for books with own HTML.


@@ -32,7 +34,7 @@ EBOOK_FORMATS = EBOOK_FORMATS_WITHOUT_CHILDREN + EBOOK_FORMATS_WITH_CHILDREN
 EBOOK_CONTENT_TYPES = {
     'html': 'text/html',
     'pdf': 'application/pdf',
 EBOOK_CONTENT_TYPES = {
     'html': 'text/html',
     'pdf': 'application/pdf',

-    'txt': 'text/plain',
+    'txt': 'text/plain; charset=utf-8',

     'epub': 'application/epub+zip',
     'mobi': 'application/x-mobipocket-ebook',
     'fb2': 'text/xml',
     'epub': 'application/epub+zip',
     'mobi': 'application/x-mobipocket-ebook',
     'fb2': 'text/xml',