From 1786ee879616291f82b499289d435be8e791622c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 31 May 2022 15:09:43 +0200 Subject: [PATCH] Bug 30310: Adjust js-date-format Test plan: Confirm that the test plan from bug 24455 is still passing Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 63242128a12a455de8c5339318df3ad88607d1bf) Signed-off-by: Matt Blenkinsop --- .../prog/en/includes/js-date-format.inc | 20 +++++++++++----- .../bootstrap/en/includes/js-date-format.inc | 24 +++++++++++++------ 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc index 6b302166c9..f8bff29d8f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc @@ -2,8 +2,14 @@ [% USE raw %] [% USE Asset %] [% USE KohaDates %] -[% Asset.js("lib/moment/moment.min.js") | $raw %] -[% Asset.js("lib/moment/moment-timezone-with-data-10-year-range.min.js") | $raw %] +[% Asset.js("lib/dayjs/dayjs.min.js") | $raw %] +[% Asset.js("lib/dayjs/plugin/timezone.js") | $raw %] +[% Asset.js("lib/dayjs/plugin/utc.js") | $raw %] + + + + + -- 2.39.5