From: Tim Otten <totten@civicrm.org>
Date: Tue, 13 Aug 2013 23:51:10 +0000 (-0700)
Subject: CRM-12892 - CRM/Form/validate.tpl - Don't put messages in CRM.validate defaults
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0a31b361db74a89b39c11b4e6be14a0eff9d9b49;p=civicrm-core.git

CRM-12892 - CRM/Form/validate.tpl - Don't put messages in CRM.validate defaults

----------------------------------------
* 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 ea5e683d1c..e2f10281d4 100644
--- a/templates/CRM/Form/validate.tpl
+++ b/templates/CRM/Form/validate.tpl
@@ -33,27 +33,29 @@
 {literal}
 <script type="text/javascript" >
 cj(function($) {
+  var messages = {{/literal}
+        required: "{ts escape='js'}This field is required.{/ts}",
+        remote: "{ts escape='js'}Please fix this field.{/ts}",
+        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 (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}",
+        equalTo: "{ts escape='js'}Please enter the same value again.{/ts}",
+        accept: "{ts escape='js'}Please enter a value with a valid extension.{/ts}",
+        maxlength: $.validator.format("{ts escape='js'}Please enter no more than {ldelim}0{rdelim} characters.{/ts}"),
+        minlength: $.validator.format("{ts escape='js'}Please enter at least {ldelim}0{rdelim} characters.{/ts}"),
+        rangelength: $.validator.format("{ts escape='js'}Please enter a value between {ldelim}0{rdelim} and {ldelim}1{rdelim} characters long.{/ts}"),
+        range: $.validator.format("{ts escape='js'}Please enter a value between {ldelim}0{rdelim} and {ldelim}1{rdelim}.{/ts}"),
+        max: $.validator.format("{ts escape='js'}Please enter a value less than or equal to {ldelim}0{rdelim}.{/ts}"),
+        min: $.validator.format("{ts escape='js'}Please enter a value greater than or equal to {ldelim}0{rdelim}.{/ts}")
+  {literal}};
+
   var params = {
     'errorClass': 'crm-inline-error',
-    messages: {{/literal}
-      required: "{ts escape='js'}This field is required.{/ts}",
-      remote: "{ts escape='js'}Please fix this field.{/ts}",
-      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 (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}",
-      equalTo: "{ts escape='js'}Please enter the same value again.{/ts}",
-      accept: "{ts escape='js'}Please enter a value with a valid extension.{/ts}",
-      maxlength: $.validator.format("{ts escape='js'}Please enter no more than {ldelim}0{rdelim} characters.{/ts}"),
-      minlength: $.validator.format("{ts escape='js'}Please enter at least {ldelim}0{rdelim} characters.{/ts}"),
-      rangelength: $.validator.format("{ts escape='js'}Please enter a value between {ldelim}0{rdelim} and {ldelim}1{rdelim} characters long.{/ts}"),
-      range: $.validator.format("{ts escape='js'}Please enter a value between {ldelim}0{rdelim} and {ldelim}1{rdelim}.{/ts}"),
-      max: $.validator.format("{ts escape='js'}Please enter a value less than or equal to {ldelim}0{rdelim}.{/ts}"),
-      min: $.validator.format("{ts escape='js'}Please enter a value greater than or equal to {ldelim}0{rdelim}.{/ts}")
-    {literal}}
+    messages: {}
   };
 
   // use civicrm notifications when there are errors
@@ -70,7 +72,7 @@ cj(function($) {
 
   CRM.validate.params = CRM.validate.params || {};
   $.extend(CRM.validate.params, params);
-  $.extend($.validator.messages, CRM.validate.params.messages);
+  $.extend($.validator.messages, messages);
 
   {/literal}
   {if $form && $form.formName}