Bug 25133: (follow-up) Move changes to timepicker.inc

Witht the changes in calendar.inc there can be a js error where the timepicker is not
included. Moving the changes to timepicker.inc should resolve this

Note: in previous patches the amnames/pmnames were removed. It is possible they had
no effect because they were declared in two files, so I have left them in timepicker.inc

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index dc7ee94..5b4f809 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -123,10 +123,6 @@ jQuery(function($){
         showMonthAfterYear: false,
         yearSuffix: ''};
     $.datepicker.setDefaults($.datepicker.regional['']);
-    $.timepicker.regional[''] = {
-        timeFormat: "[% IF Koha.Preference('TimeFormat') == '12hr' %]hh:mm TT[% ELSE %]HH:mm[% END %]",
-    };
-    $.timepicker.setDefaults($.timepicker.regional['']);
 });
 
 /*  jQuery Validator plugin custom method

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc
index 534c4b1..2bcb38d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc
@@ -3,6 +3,7 @@
     /* Localization of the timepicker plugin */
     jQuery(function($){
         $.timepicker.regional[''] = {
+            timeFormat: "[% IF Koha.Preference('TimeFormat') == '12hr' %]hh:mm TT[% ELSE %]HH:mm[% END %]",
             currentText: _("Now"),
             closeText: _("Done"),
             amNames: [_("AM"), _("A")],