From 10c7d9a6e1d8f2a9f66609492373c6ed816e81a0 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Fri, 17 Aug 2018 11:10:23 +0200
Subject: [PATCH] Statistics: Prevent issues with async script loading

---
 src/pretix/control/templates/pretixcontrol/base.html      | 3 ++-
 .../static/pretixplugins/statistics/statistics.js         | 8 +++++++-
 .../templates/pretixplugins/statistics/index.html         | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html
index 1716c91eb..8f62ecf16 100644
--- a/src/pretix/control/templates/pretixcontrol/base.html
+++ b/src/pretix/control/templates/pretixcontrol/base.html
@@ -14,7 +14,8 @@
     		<link rel="stylesheet" type="text/x-scss" href="{% static "pretixcontrol/scss/main.scss" %}" />
 		{% endcompress %}
         {% if DEBUG %}
-            <script type="text/javascript" src="{% url 'javascript-catalog' lang=request.LANGUAGE_CODE %}" async></script>
+            <script type="text/javascript" src="{% url 'javascript-catalog' lang=request.LANGUAGE_CODE %}"
+                    defer></script>
         {% else %}
             <script src="{% statici18n LANGUAGE_CODE %}" async></script>
         {% endif %}
diff --git a/src/pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js b/src/pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js
index 544159f16..b84e1aa0d 100644
--- a/src/pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js
+++ b/src/pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js
@@ -1,4 +1,10 @@
-/*globals $, Morris, gettext*/
+/*globals $, Morris, gettext, django*/
+function gettext(msgid) {
+    if (typeof django !== 'undefined' && typeof django.gettext !== 'undefined') {
+        return django.gettext(msgid);
+    }
+    return msgid;
+}
 $(function () {
     $(".chart").css("height", "250px");
     new Morris.Area({
diff --git a/src/pretix/plugins/statistics/templates/pretixplugins/statistics/index.html b/src/pretix/plugins/statistics/templates/pretixplugins/statistics/index.html
index ef4a57066..71b16389e 100644
--- a/src/pretix/plugins/statistics/templates/pretixplugins/statistics/index.html
+++ b/src/pretix/plugins/statistics/templates/pretixplugins/statistics/index.html
@@ -63,7 +63,8 @@
         <script type="application/json" id="rev-data">{{ rev_data|escapejson }}</script>
         <script type="application/json" id="obp-data">{{ obp_data|escapejson }}</script>
         <script type="application/text" id="currency">{{ request.event.currency }}</script>
-        <script type="application/javascript" src="{% static "pretixplugins/statistics/statistics.js" %}"></script>
+        <script type="application/javascript" src="{% static "pretixplugins/statistics/statistics.js" %}"
+                defer></script>
     {% else %}
         <div class="empty-collection">
             <p>