From cdd19438366641ef5069929982030c10018ec00f Mon Sep 17 00:00:00 2001
From: Zog
Date: Fri, 13 Apr 2018 14:48:21 +0200
Subject: Refs #6337; Make date validation JS locale-agnostic

---
 app/assets/javascripts/smart_date.coffee | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/smart_date.coffee b/app/assets/javascripts/smart_date.coffee
index 48aa1c2f9..9c8b44207 100644
--- a/app/assets/javascripts/smart_date.coffee
+++ b/app/assets/javascripts/smart_date.coffee
@@ -14,11 +14,16 @@ window.isLeapYear = (year) ->
 
 window.smartCorrectDate = ->
   allSelectors = $(@).parent().children('select')
-  allVals      = allSelectors.map (index, sel) ->
-    parseInt($(sel).val())
+
+  yearSelect = allSelectors.filter("[name$='(1i)]']")
+  monthSelect = allSelectors.filter("[name$='(2i)]']")
+  daySelect = allSelectors.filter("[name$='(3i)]']")
+  # We expect [day, month, year], so french
+  allVals      = [daySelect, monthSelect, yearSelect].map (sel, index) ->
+    parseInt(sel.val())
+
   correctedDay = correctDay allVals
-  daySelector  = allSelectors.first()
-  $(daySelector).val(correctedDay)
+  daySelect.val(correctedDay)
 
 $ ->
   $(document).on 'change', '.smart_date select', smartCorrectDate
-- 
cgit v1.2.3