fnp
/
audio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use StreamingIterator to avoid loading the whole movie file.
[audio.git]
/
src
/
archive
/
settings.py
diff --git
a/src/archive/settings.py
b/src/archive/settings.py
index
747287d
..
91921a8
100644
(file)
--- a/
src/archive/settings.py
+++ b/
src/archive/settings.py
@@
-1,5
+1,3
@@
-# -*- coding: utf-8 -*-
-
import os.path
from django.conf import settings
import os.path
from django.conf import settings
@@
-38,13
+36,6
@@
except AttributeError:
"archive/final"))
"archive/final"))
-# here the app keeps temporary build files
-try:
- BUILD_PATH = settings.ARCHIVE_BUILD_PATH
-except AttributeError:
- BUILD_PATH = os.path.abspath(os.path.join(settings.MEDIA_ROOT,
- "archive/build"))
-
UPLOAD_URL = getattr(
settings,
'ARCHIVE_UPLOAD_URL',
UPLOAD_URL = getattr(
settings,
'ARCHIVE_UPLOAD_URL',
@@
-55,22
+46,30
@@
UPLOAD_URL = getattr(
try:
PROJECT = settings.ARCHIVE_PROJECT
except AttributeError:
try:
PROJECT = settings.ARCHIVE_PROJECT
except AttributeError:
- PROJECT = u'Wolne Lektury'
+ PROJECT = 'Wolne Lektury'
+
+
+LICENSE = getattr(
+ settings,
+ 'ARCHIVE_LICENSE',
+ 'http://artlibre.org/licence/lal/pl/'
+)
+
+LICENSE_NAME = getattr(
+ settings, 'ARCHIVE_LICENSE_NAME',
+ 'Licencja Wolnej Sztuki 1.3'
+)
-try:
- LICENSE = settings.ARCHIVE_LICENSE
-except AttributeError:
- LICENSE = u'http://creativecommons.org/licenses/by-sa/3.0/deed.pl'
try:
ORGANIZATION = settings.ARCHIVE_ORGANIZATION
except AttributeError:
try:
ORGANIZATION = settings.ARCHIVE_ORGANIZATION
except AttributeError:
- ORGANIZATION =
u
'Fundacja Nowoczesna Polska'
+ ORGANIZATION = 'Fundacja Nowoczesna Polska'
try:
ADVERT = settings.ARCHIVE_ADVERT
except AttributeError:
try:
ADVERT = settings.ARCHIVE_ADVERT
except AttributeError:
- ADVERT =
u
"""
+ ADVERT = """
Przekaż 1% podatku na rozwój Wolnych Lektur:
Fundacja Nowoczesna Polska
KRS 0000070056
Przekaż 1% podatku na rozwój Wolnych Lektur:
Fundacja Nowoczesna Polska
KRS 0000070056