From 8cc7658551f2ea4db63acbf7687ab1e37a6ca205 Mon Sep 17 00:00:00 2001 From: pylover Date: Tue, 18 Mar 2014 03:32:14 +0330 Subject: [PATCH 1/2] Persian date --- src/additional/dateFA.js | 3 +++ src/localization/messages_fa.js | 1 + 2 files changed, 4 insertions(+) create mode 100644 src/additional/dateFA.js diff --git a/src/additional/dateFA.js b/src/additional/dateFA.js new file mode 100644 index 000000000..cbc959123 --- /dev/null +++ b/src/additional/dateFA.js @@ -0,0 +1,3 @@ +jQuery.validator.addMethod("dateFA", function(value, element) { + return this.optional(element) || /^[1-4]\d{3}\/((0?[1-6]\/((3[0-1])|([1-2][0-9])|(0?[1-9])))|((1[0-2]|(0?[7-9]))\/(30|([1-2][0-9])|(0?[1-9]))))$/.test(value); +}, "Please enter a correct date"); diff --git a/src/localization/messages_fa.js b/src/localization/messages_fa.js index affed1974..920f6802b 100644 --- a/src/localization/messages_fa.js +++ b/src/localization/messages_fa.js @@ -9,6 +9,7 @@ email: ".لطفا یک ایمیل صحیح وارد کنید", url: "لطفا آدرس صحیح وارد کنید.", date: "لطفا یک تاریخ صحیح وارد کنید", + dateFA: "لطفا یک تاریخ صحیح وارد کنید", dateISO: "لطفا تاریخ صحیح وارد کنید (ISO).", number: "لطفا عدد صحیح وارد کنید.", digits: "لطفا تنها رقم وارد کنید", From ee9e05fe10aa87313fc8e3b2f0e643b32f3f8538 Mon Sep 17 00:00:00 2001 From: pylover Date: Tue, 15 Apr 2014 19:17:09 +0430 Subject: [PATCH 2/2] tests added --- src/localization/messages_fa.js | 4 +++- test/methods.js | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/localization/messages_fa.js b/src/localization/messages_fa.js index 920f6802b..b4043bf6b 100644 --- a/src/localization/messages_fa.js +++ b/src/localization/messages_fa.js @@ -21,6 +21,8 @@ rangelength: $.validator.format("لطفا مقداری بین {0} تا {1} حرف وارد کنید."), range: $.validator.format("لطفا مقداری بین {0} تا {1} حرف وارد کنید."), max: $.validator.format("لطفا مقداری کمتر از {0} حرف وارد کنید."), - min: $.validator.format("لطفا مقداری بیشتر از {0} حرف وارد کنید.") + min: $.validator.format("لطفا مقداری بیشتر از {0} حرف وارد کنید."), + minWords: $.validator.format("لطفا حداقل {0} کلمه وارد کنید."), + maxWords: $.validator.format("لطفا حداکثر {0} کلمه وارد کنید.") }); }(jQuery)); diff --git a/test/methods.js b/test/methods.js index d0a5ec476..991f44d98 100644 --- a/test/methods.js +++ b/test/methods.js @@ -609,7 +609,29 @@ test("dateITA", function() { ok(!method( "01/01/199" ), "Invalid date ITA" ); }); +test("dateFA", function() { + var method = methodTest("dateFA"); + + ok( method( "1342/12/29" ), "Valid date FA" ); + ok( method( "1342/12/30" ), "Valid date FA" ); + ok( method( "1361/6/31" ), "Valid date FA" ); + ok( method( "1321/11/30" ), "Valid date FA" ); + ok( method( "1361/1/1" ), "Valid date FA" ); + ok( method( "1020/3/3" ), "Valid date FA" ); + ok( method( "1020/03/3" ), "Valid date FA" ); + ok( method( "1020/3/03" ), "Valid date FA" ); + ok( method( "1020/03/03" ), "Valid date FA" ); + ok( method( "1001/7/30" ), "Valid date FA" ); + + ok(!method( "1000/1/32" ), "Invalid date FA" ); + ok(!method( "1323/12/31" ), "Invalid date FA" ); + ok(!method( "1361/0/11" ), "Invalid date FA" ); + ok(!method( "63/4/4" ), "Invalid date FA" ); + ok(!method( "15/6/1361" ), "Invalid date FA" ); +}); + test("iban", function() { + var method = methodTest("iban"); ok( method( "NL20INGB0001234567"), "Valid IBAN"); ok( method( "DE68 2105 0170 0012 3456 78"), "Valid IBAN");