From 302c6da17f2dca21f59cf3bebecf788231afe5d6 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Wed, 9 Nov 2016 19:47:42 +0100
Subject: [PATCH] Fix integration of django-statici18n

---
 src/.gitignore         | 1 +
 src/Makefile           | 6 +++---
 src/pretix/settings.py | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/.gitignore b/src/.gitignore
index 2643f0ea8b..2cd7bd80d7 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -7,4 +7,5 @@ build/
 dist/
 *.egg-info/
 *.bak
+static/jsi18n/
 
diff --git a/src/Makefile b/src/Makefile
index 07171f0e3e..91fa5abbbd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
-all: localecompile staticfiles jsi18n
-production: localecompile staticfiles compress jsi18n
+all: localecompile staticfiles
+production: localecompile staticfiles compress
 
 localecompile:
 	./manage.py compilemessages
@@ -8,7 +8,7 @@ localegen:
 	./manage.py makemessages --all --ignore "pretix/helpers/*"
 	./manage.py makemessages --all -d djangojs --ignore "pretix/helpers/*"
 
-staticfiles:
+staticfiles: jsi18n
 	./manage.py collectstatic --noinput
 
 compress:
diff --git a/src/pretix/settings.py b/src/pretix/settings.py
index 13e2dcfe09..464b5ea2a3 100644
--- a/src/pretix/settings.py
+++ b/src/pretix/settings.py
@@ -310,6 +310,8 @@ STATICFILES_DIRS = [
     os.path.join(BASE_DIR, 'static')
 ] 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'
 
 # if os.path.exists(os.path.join(DATA_DIR, 'static')):