Attachment 55252 Details for Bug 14060 – Bug 14060: Display date format pattern instead of date format name

[patch] Bug 14060: Display date format pattern instead of date format name

Bug-14060-Display-date-format-pattern-instead-of-d.patch (text/plain), 1.59 KB, created by Nick Clemens (kidclamp) on 2016-09-06 12:26:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2016-09-06 12:26:46 UTC

Size: 1.59 KB

patch

obsolete

>From fc35a15195f67720083c37a9159d693eaf690a29 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 26 Aug 2016 08:44:06 +0100
>Subject: [PATCH] Bug 14060: Display date format pattern instead of date format
> name
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc | 16 +++++++++++++++-
> 1 file changed, 15 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 0eb2c7f..185a51c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
>@@ -31,9 +31,23 @@ function is_valid_date(date) {
>     return 1;
> }
> 
>+function get_dateformat_str(dateformat) {
>+    var dateformat_str;
>+    if ( dateformat == 'us' ) {
>+        dateformat_str = 'mm/dd/yyyy';
>+    } else if ( dateformat == 'metric' ) {
>+        dateformat_str = 'dd/mm/yyyy';
>+    } else if (dateformat == 'iso' ) {
>+        dateformat_str = 'yyyy-mm-dd';
>+    } else if ( dateformat == 'dmydot' ) {
>+        dateformat_str = 'dd.mm.yyyy';
>+    }
>+    return dateformat_str;
>+}
>+
> function validate_date (dateText, inst) {
>     if ( !is_valid_date(dateText) ) {
>-        var dateformat_str = '[% Koha.Preference('dateformat') %]';
>+        var dateformat_str = get_dateformat_str( '[% Koha.Preference('dateformat') %]' );
>         alert(MSG_PLEASE_ENTER_A_VALID_DATE.format(dateformat_str));
>         $('#'+inst.id).val('');
>     }
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 14060: 38484 | 38540 | 38541 | 44542 | 44543 | 44544 | 45282 | 46224 | 54606 | 54607 | 54608 | 54609 | 54610 | 54902 | 54903 | 54904 | 54905 | 54906 | 54907 | 55001 | 55002 | 55012 | 55013 | 55014 | 55015 | 55016 | 55017 | 55018 | 55019 | 55165 | 55246 | 55247 | 55248 | 55249 | 55250 | 55251 | 55252 | 55253 | 55254 | 55255 | 55256