diff --git a/AKPlan/templates/AKPlan/load_fullcalendar.html b/AKPlan/templates/AKPlan/load_fullcalendar.html new file mode 100644 index 0000000000000000000000000000000000000000..30fc76b83ee95d767c23b05e874a5abfd1d61df6 --- /dev/null +++ b/AKPlan/templates/AKPlan/load_fullcalendar.html @@ -0,0 +1,13 @@ +{% 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 %} diff --git a/AKPlan/templates/AKPlan/plan_akslot.html b/AKPlan/templates/AKPlan/plan_akslot.html index e519491fe66bbe91064be9ffca4a5b878ecfb2bb..ffa9dae9a65641c85a797e6a54ade5ce1441b07b 100644 --- a/AKPlan/templates/AKPlan/plan_akslot.html +++ b/AKPlan/templates/AKPlan/plan_akslot.html @@ -1,14 +1,8 @@ {% 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, diff --git a/AKPlan/templates/AKPlan/plan_base.html b/AKPlan/templates/AKPlan/plan_base.html index 50cb2c07baab49eb7bef6dbb945ba1a5b1519504..7234dad49ddafd712f0264870a7015a7a343cdc0 100644 --- a/AKPlan/templates/AKPlan/plan_base.html +++ b/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 %} diff --git a/AKPlan/templates/AKPlan/plan_detail.html b/AKPlan/templates/AKPlan/plan_detail.html index 7c4423dac832d3a6d45e5c78efca62800381d8ec..430596fa5b8b9b70f1fb4574b53aa4cfe2f445e7 100644 --- a/AKPlan/templates/AKPlan/plan_detail.html +++ b/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: '', diff --git a/AKPlan/templates/AKPlan/plan_index.html b/AKPlan/templates/AKPlan/plan_index.html index 149559723f1623bc7a3cd7d78499578710a883d7..f1270d7356265d74a7089196b566298fd8460e43 100644 --- a/AKPlan/templates/AKPlan/plan_index.html +++ b/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: { diff --git a/AKPlan/templates/AKPlan/plan_wall.html b/AKPlan/templates/AKPlan/plan_wall.html index a04e1e9107aba7fe75494232a29e2fa8f9bfe446..ac49b82e3228645552a4636cfcba7a78344520e7 100644 --- a/AKPlan/templates/AKPlan/plan_wall.html +++ b/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: { diff --git a/AKScheduling/templates/admin/AKScheduling/scheduling.html b/AKScheduling/templates/admin/AKScheduling/scheduling.html index 6d5eb9857856d0833f3d7ca3435b7d46a73faa0d..75dc0c3c23071023c21beb3c5a4d4eed42f453ce 100644 --- a/AKScheduling/templates/admin/AKScheduling/scheduling.html +++ b/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: {