From df7fac641a669bab9abec023ceef1c9f9de56ade Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 18 Aug 2017 16:20:41 +0530 Subject: [PATCH] [fix] DateRange filter when language is not en --- frappe/public/js/frappe/form/control.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 70e6c8216c..a5facbadf8 100755 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -953,8 +953,12 @@ frappe.ui.form.ControlDateRange = frappe.ui.form.ControlData.extend({ this.set_mandatory && this.set_mandatory(value); }, parse: function(value) { - if(value && (value.indexOf(',') !== -1 || value.indexOf('to') !== -1)) { - var vals = value.split(/[( to )(,)]/); + const to = __(to); + var re = new RegExp(`[( ${to} )]`); + value = value.replace(re, ','); + + if(value && value.includes(',')) { + var vals = value.split(','); var from_date = moment(frappe.datetime.user_to_obj(vals[0])).format('YYYY-MM-DD'); var to_date = moment(frappe.datetime.user_to_obj(vals[vals.length-1])).format('YYYY-MM-DD'); return [from_date, to_date];