Attachment 44544 Details for Bug 14060 – Bug 14060: Display the date format on the warning popup

[patch] Bug 14060: Display the date format on the warning popup

Bug-14060-Display-the-date-format-on-the-warning-p.patch (text/plain), 1.74 KB, created by Jonathan Druart on 2015-11-06 10:18:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-11-06 10:18:20 UTC

Size: 1.74 KB

patch

obsolete

>From bd41cbdc3895d60b6af87ab478c3ec80e5cc3bd0 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Mon, 27 Apr 2015 10:42:51 +0200
>Subject: [PATCH] Bug 14060: Display the date format on the warning popup
>
>The date format is now displayed on the warning popup.
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
>index 31944d5..6819c99 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
>@@ -6,21 +6,25 @@ var debug    = "[% debug %]";
> var dformat  = "[% dateformat %]";
> var sentmsg = 0;
> if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");}
>-var MSG_PLEASE_ENTER_A_VALID_DATE = ("Please enter a valid date.");
>+var MSG_PLEASE_ENTER_A_VALID_DATE = _("Please enter a valid date (should match %s).");
> 
> function validate_date (dateText, inst) {
>     var dateformat = '[% Koha.Preference('dateformat') %]';
>+    var dateformat_str = dateformat
>     if ( dateformat == 'us' ) {
>         dateformat = 'mm/dd/yy';
>+        dateformat_str = 'mm/dd/yyyy';
>     } else if ( dateformat == 'metric' ) {
>         dateformat = 'dd/mm/yy';
>+        dateformat_str = 'dd/mm/yyyy';
>     } else if (dateformat == 'iso' ) {
>         dateformat = 'yy-mm-dd';
>+        dateformat_str = 'yyyy-mm-dd';
>     }
>     try {
>         $.datepicker.parseDate(dateformat, dateText);
>     } catch (e) {
>-        alert(MSG_PLEASE_ENTER_A_VALID_DATE);
>+        alert(MSG_PLEASE_ENTER_A_VALID_DATE.format(dateformat_str));
>         $('#'+inst.id).val('');
>     };
> }
>-- 
>2.1.0

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