From: Tim Otten <totten@civicrm.org>
Date: Tue, 13 Aug 2013 23:45:30 +0000 (-0700)
Subject: CRM-12892 - CRM/Form/validate.tpl - Clarify error about date formatting
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=81c267f596c8b516c6720abdd679902625a9d4d5;p=civicrm-core.git

CRM-12892 - CRM/Form/validate.tpl - Clarify error about date formatting

Also: Fix loading of custom error messages

----------------------------------------
* CRM-12892: CiviHR - Entity - Job Positions & Roles
  http://issues.civicrm.org/jira/browse/CRM-12892
---

diff --git a/templates/CRM/Form/validate.tpl b/templates/CRM/Form/validate.tpl
index 419e696dbc..ea5e683d1c 100644
--- a/templates/CRM/Form/validate.tpl
+++ b/templates/CRM/Form/validate.tpl
@@ -41,7 +41,7 @@ cj(function($) {
       email: "{ts escape='js'}Please enter a valid email address.{/ts}",
       url: "{ts escape='js'}Please enter a valid URL.{/ts}",
       date: "{ts escape='js'}Please enter a valid date.{/ts}",
-      dateISO: "{ts escape='js'}Please enter a valid date (ISO).{/ts}",
+      dateISO: "{ts escape='js'}Please enter a valid date (YYYY-MM-DD).{/ts}",
       number: "{ts escape='js'}Please enter a valid number.{/ts}",
       digits: "{ts escape='js'}Please enter only digits.{/ts}",
       creditcard: "{ts escape='js'}Please enter a valid credit card number.{/ts}",
@@ -70,6 +70,7 @@ cj(function($) {
 
   CRM.validate.params = CRM.validate.params || {};
   $.extend(CRM.validate.params, params);
+  $.extend($.validator.messages, CRM.validate.params.messages);
 
   {/literal}
   {if $form && $form.formName}