@@ -, +, @@ --- 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(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ a/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 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -236,7 +236,7 @@ [% IF ( INVALID_DATE ) %]

- +

[% ELSE %] --