From 69e5eed4eee1489e566dfde86a40c14f4f6c50d1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 17 Apr 2020 12:11:25 +0200 Subject: [PATCH] Bug 25133: Fix time part of due date for 12hr Signed-off-by: Nick Clemens --- koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc | 6 ++++++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc index 9b266b61a9..82e3826149 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -122,6 +122,12 @@ jQuery(function($){ showMonthAfterYear: false, yearSuffix: ''}; $.datepicker.setDefaults($.datepicker.regional['']); + $.timepicker.regional[''] = { + timeFormat: "[% IF Koha.Preference('TimeFormat') == '12hr' %]hh:mm TT[% ELSE %]HH:mm[% END %]", + amNames: ['AM', 'A'], + pmNames: ['PM', 'P'], + }; + $.timepicker.setDefaults($.timepicker.regional['']); }); /* jQuery Validator plugin custom method diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 9087ccb03d..7423164850 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -236,7 +236,7 @@ [% IF ( INVALID_DATE ) %]

- +

[% ELSE %] -- 2.11.0