Merge branch 'master' of gitlab.fachschaften.org:kif/akplanning

AKPlan/templates/AKPlan/load_fullcalendar.html

+{% load static %}
+{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
+
+<script src='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.js' %}'></script>
+<link href='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.css' %}' rel='stylesheet'/>
+
+{% with 'AKPlan/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %}
+    {% if LANGUAGE_CODE != "en" %}
+        {# Locale 'en' is included in main.js and does not exist separately #}
+        <script src="{% static locale_file %}"></script>
+    {% endif %}
+{% endwith %}

AKPlan/templates/AKPlan/plan_akslot.html

 {% load static %}
 {% load tz %}
 {% load i18n %}
-{% get_current_language as LANGUAGE_CODE %}
 
-<script src='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.js' %}'></script>
-<link href='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.css' %}' rel='stylesheet'/>
-
-{% with 'AKPlan/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %}
-    <script src="{% static locale_file %}"></script>
-{% endwith %}
+{% include "AKPlan/load_fullcalendar.html" %}
 
 <script>
 
@@ -19,8 +13,6 @@
             // Adapt to timezone of the connected event
             timeZone: '{{ ak.event.timezone }}',
             initialView: 'timeGrid',
-            // Adapt to user selected locale
-            locale: '{{ LANGUAGE_CODE }}',
             // No header, not buttons
             headerToolbar: false,
             aspectRatio: 2.5,

AKPlan/templates/AKPlan/plan_base.html

@@ -10,14 +10,7 @@
 {% endblock %}
 
 {% block imports %}
-    {% get_current_language as LANGUAGE_CODE %}
-
-    <script src='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.js' %}'></script>
-    <link href='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.css' %}' rel='stylesheet'/>
-
-    {% with 'AKPlan/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %}
-        <script src="{% static locale_file %}"></script>
-    {% endwith %}
+    {% include "AKPlan/load_fullcalendar.html" %}
 
     {% block fullcalendar %}{% endblock %}
 {% endblock imports %}

AKPlan/templates/AKPlan/plan_detail.html

@@ -18,8 +18,6 @@
                     // Adapt to timezone of the connected event
                     timeZone: '{{ event.timezone }}',
                     initialView: 'timeGrid',
-                    // Adapt to user selected locale
-                    locale: '{{ LANGUAGE_CODE }}',
                     // No header, not buttons
                     headerToolbar: {
                         left: '',

AKPlan/templates/AKPlan/plan_index.html

@@ -22,8 +22,6 @@
                         right: 'resourceTimelineDay,resourceTimelineEvent'
                     },
                     themeSystem: 'bootstrap',
-                    // Adapt to user selected locale
-                    locale: '{{ LANGUAGE_CODE }}',
                     initialView: 'resourceTimelineEvent',
                     views: {
                         resourceTimelineDay: {

AKPlan/templates/AKPlan/plan_wall.html

@@ -19,14 +19,7 @@
 
     <link rel="stylesheet" href="{% static 'common/css/custom.css' %}">
 
-    {% get_current_language as LANGUAGE_CODE %}
-
-    <script src='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.js' %}'></script>
-    <link href='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.css' %}' rel='stylesheet'/>
-
-    {% with 'AKPlan/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %}
-        <script src="{% static locale_file %}"></script>
-    {% endwith %}
+    {% include "AKPlan/load_fullcalendar.html" %}
 
     <script>
         document.addEventListener('DOMContentLoaded', function () {
@@ -36,8 +29,6 @@
                 timeZone: '{{ event.timezone }}',
                 headerToolbar: false,
                 themeSystem: 'bootstrap',
-                // Adapt to user selected locale
-                locale: '{{ LANGUAGE_CODE }}',
                 slotDuration: '01:00',
                 initialView: 'resourceTimeline',
                 visibleRange: {

AKScheduling/templates/admin/AKScheduling/scheduling.html

@@ -11,14 +11,7 @@
 
 {% block extrahead %}
     {{ block.super }}
-    {% get_current_language as LANGUAGE_CODE %}
-
-    <script src='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.js' %}'></script>
-    <link href='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.css' %}' rel='stylesheet'/>
-
-    {% with 'AKPlan/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %}
-        <script src="{% static locale_file %}"></script>
-    {% endwith %}
+    {% include "AKPlan/load_fullcalendar.html" %}
 
     <style>
         .unscheduled-slot {
@@ -85,8 +78,6 @@
                 },
                 //aspectRatio: 2,
                 themeSystem: 'bootstrap',
-                // Adapt to user selected locale
-                locale: '{{ LANGUAGE_CODE }}',
                 initialView: 'resourceTimelineEventVert',
                 views: {
                     resourceTimelineDayHoriz: {