Bugzilla – Attachment 104269 Details for
Bug 25133
Specify Due date changes from PM to AM if library has their TimeFormat set to 12hr
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25133: (follow-up) Move changes to timepicker.inc
Bug-25133-follow-up-Move-changes-to-timepickerinc.patch (text/plain), 2.10 KB, created by
Jonathan Druart
on 2020-05-04 12:44:24 UTC
(
hide
)
Description:
Bug 25133: (follow-up) Move changes to timepicker.inc
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-05-04 12:44:24 UTC
Size:
2.10 KB
patch
obsolete
>From 607ef337b44c7e78396f326aef86240d1f805027 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Mon, 4 May 2020 11:33:11 +0000 >Subject: [PATCH] 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> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc | 4 ---- > koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc | 1 + > 2 files changed, 1 insertion(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >index dc7ee942bf..5b4f809b8f 100644 >--- 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 534c4b1e16..2bcb38df7e 100644 >--- 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")], >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25133
:
103137
|
103236
|
103366
|
103367
|
103368
|
103369
|
103370
|
103371
|
104228
|
104229
|
104230
|
104260
| 104269