diff --git a/src/Makefile b/src/Makefile
index c5edda3ab1..07171f0e3e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
-all: localecompile staticfiles
-production: localecompile staticfiles compress
+all: localecompile staticfiles jsi18n
+production: localecompile staticfiles compress jsi18n
localecompile:
./manage.py compilemessages
@@ -14,6 +14,9 @@ staticfiles:
compress:
./manage.py compress
+jsi18n: localecompile
+ ./manage.py compilejsi18n
+
test:
py.test tests
diff --git a/src/pretix/control/context.py b/src/pretix/control/context.py
index 28102aa989..3246cacf6c 100644
--- a/src/pretix/control/context.py
+++ b/src/pretix/control/context.py
@@ -19,6 +19,7 @@ def contextprocessor(request):
ctx = {
'url_name': url.url_name,
'settings': settings,
+ 'DEBUG': settings.DEBUG,
}
_html_head = []
if hasattr(request, 'event'):
diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html
index ae9f7ab4f0..3d4c58c09b 100644
--- a/src/pretix/control/templates/pretixcontrol/base.html
+++ b/src/pretix/control/templates/pretixcontrol/base.html
@@ -1,6 +1,7 @@
{% load compress %}
{% load staticfiles %}
{% load i18n %}
+{% load statici18n %}
@@ -9,7 +10,11 @@
{% compress css %}
{% endcompress %}
-
+ {% if DEBUG %}
+
+ {% else %}
+
+ {% endif %}
{% compress js %}
diff --git a/src/pretix/presale/context.py b/src/pretix/presale/context.py
index 519aa7a87f..7977377758 100644
--- a/src/pretix/presale/context.py
+++ b/src/pretix/presale/context.py
@@ -15,7 +15,8 @@ def contextprocessor(request):
return {}
ctx = {
- 'css_file': None
+ 'css_file': None,
+ 'DEBUG': settings.DEBUG,
}
_html_head = []
_footer = []
diff --git a/src/pretix/presale/templates/pretixpresale/base.html b/src/pretix/presale/templates/pretixpresale/base.html
index dc5d18d452..f5e2ff7647 100644
--- a/src/pretix/presale/templates/pretixpresale/base.html
+++ b/src/pretix/presale/templates/pretixpresale/base.html
@@ -2,6 +2,7 @@
{% load staticfiles %}
{% load i18n %}
{% load safelink %}
+{% load statici18n %}
@@ -50,7 +51,12 @@
{% trans "If this takes longer than a few minutes, please contact us." %}
-
+{% if DEBUG %}
+
+{% else %}
+
+{% endif %}
+
{% compress js %}
diff --git a/src/pretix/settings.py b/src/pretix/settings.py
index a8f2bf2326..13e2dcfe09 100644
--- a/src/pretix/settings.py
+++ b/src/pretix/settings.py
@@ -180,6 +180,7 @@ INSTALLED_APPS = [
'django_otp',
'django_otp.plugins.otp_totp',
'django_otp.plugins.otp_static',
+ 'statici18n',
]
try:
diff --git a/src/requirements/production.txt b/src/requirements/production.txt
index b68963e6f1..9b04cee22c 100644
--- a/src/requirements/production.txt
+++ b/src/requirements/production.txt
@@ -16,6 +16,7 @@ python-u2flib-server==4.*
# until the following issue is fixed, we need our own celery version
# https://github.com/celery/celery/pull/3199
git+https://github.com/pretix/celery.git@pretix#egg=celery
+django-statici18n==1.2.*
# Deployment / static file compilation requirements
BeautifulSoup4