From e4b213f72c1fca73979757d121b0bc9e288cac35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Mon, 18 Jan 2021 00:21:20 +0100
Subject: [PATCH] Reintroduce locale setting for fullcalendar views
Reintroduce the locale settings that where falsely removed in !74 (afa4558a and 10667a08) -- while this setting is not needed in fc version 3 that the merge request referred to, stating them explicitly is needed in v5 that is used in our project currently.
---
AKPlan/templates/AKPlan/plan_akslot.html | 2 ++
AKPlan/templates/AKPlan/plan_detail.html | 2 ++
AKPlan/templates/AKPlan/plan_index.html | 2 ++
AKPlan/templates/AKPlan/plan_wall.html | 2 ++
AKScheduling/templates/admin/AKScheduling/scheduling.html | 2 ++
5 files changed, 10 insertions(+)
diff --git a/AKPlan/templates/AKPlan/plan_akslot.html b/AKPlan/templates/AKPlan/plan_akslot.html
index ffa9dae9..95b6ac0e 100644
--- a/AKPlan/templates/AKPlan/plan_akslot.html
+++ b/AKPlan/templates/AKPlan/plan_akslot.html
@@ -13,6 +13,8 @@
// 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_detail.html b/AKPlan/templates/AKPlan/plan_detail.html
index 430596fa..7c4423da 100644
--- a/AKPlan/templates/AKPlan/plan_detail.html
+++ b/AKPlan/templates/AKPlan/plan_detail.html
@@ -18,6 +18,8 @@
// 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 f1270d73..0f2129bc 100644
--- a/AKPlan/templates/AKPlan/plan_index.html
+++ b/AKPlan/templates/AKPlan/plan_index.html
@@ -22,6 +22,8 @@
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 ac49b82e..d4ae656b 100644
--- a/AKPlan/templates/AKPlan/plan_wall.html
+++ b/AKPlan/templates/AKPlan/plan_wall.html
@@ -29,6 +29,8 @@
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 980b3bea..62b67236 100644
--- a/AKScheduling/templates/admin/AKScheduling/scheduling.html
+++ b/AKScheduling/templates/admin/AKScheduling/scheduling.html
@@ -78,6 +78,8 @@
},
//aspectRatio: 2,
themeSystem: 'bootstrap',
+ // Adapt to user selected locale
+ locale: '{{ LANGUAGE_CODE }}',
initialView: 'resourceTimelineEventVert',
views: {
resourceTimelineDayHoriz: {
--
GitLab