CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-09-15 16:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix integration of django-statici18n

Browse Source
This commit is contained in:
Raphael Michel
2016-11-09 19:47:42 +01:00
parent 45b960b97c
commit 302c6da17f
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/.gitignore
+1
View File
@@ -7,4 +7,5 @@ build/
dist/ dist/
*.egg-info/ *.egg-info/
*.bak *.bak
static/jsi18n/
src/Makefile
+3 -3
View File
@@ -1,5 +1,5 @@
all: localecompile staticfiles jsi18n all: localecompile staticfiles
production: localecompile staticfiles compress jsi18n production: localecompile staticfiles compress
localecompile: localecompile:
./manage.py compilemessages ./manage.py compilemessages
@@ -8,7 +8,7 @@ localegen:
./manage.py makemessages --all --ignore "pretix/helpers/*" ./manage.py makemessages --all --ignore "pretix/helpers/*"
./manage.py makemessages --all -d djangojs --ignore "pretix/helpers/*" ./manage.py makemessages --all -d djangojs --ignore "pretix/helpers/*"
staticfiles: staticfiles: jsi18n
./manage.py collectstatic --noinput ./manage.py collectstatic --noinput
compress: compress:
src/pretix/settings.py
+2
View File
@@ -310,6 +310,8 @@ STATICFILES_DIRS = [
os.path.join(BASE_DIR, 'static') os.path.join(BASE_DIR, 'static')
] if os.path.exists(os.path.join(BASE_DIR, 'static')) else [] ] if os.path.exists(os.path.join(BASE_DIR, 'static')) else []
STATICI18N_ROOT = os.path.join(BASE_DIR, "static")
STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage' STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
# if os.path.exists(os.path.join(DATA_DIR, 'static')): # if os.path.exists(os.path.join(DATA_DIR, 'static')):