Support default display for {0}

niceue · Jan 13, 2016 · 1a01af4 · 1a01af4 · niceue · Jan 13, 2016
1 parent f55d7c9
commit 1a01af4
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 11 deletions.
diff --git a/dist/jquery.validator.js b/dist/jquery.validator.js
@@ -954,7 +954,7 @@
                         5. default message;
                     */
                     msg = (_getDataMsg(el, field, msg || rule.msg || me.messages[method]) || me.messages.fallback).replace(/\{0\|?([^\}]*)\}/, function(){
-                        return me._getDisplay(el, field.display) || arguments[1];
+                        return me._getDisplay(el, field.display) || arguments[1] || me.messages[0];
                     });
                 }
                 if (!isValid) field.isValid = isValid;

diff --git a/dist/jquery.validator.min.js b/dist/jquery.validator.min.js
diff --git a/dist/local/en.js b/dist/local/en.js
@@ -39,11 +39,12 @@
 
         // Default error messages
         messages: {
-            fallback: "This field is not valid.",
+            0: "This field",
+            fallback: "{0} is not valid.",
             loading: "Validating...",
             error: "Network Error.",
             timeout: "Request timed out.",
-            required: "This field is required.",
+            required: "{0} is required.",
             remote: "Please try another name.",
             integer: {
                 '*': "Please enter an integer.",

diff --git a/dist/local/ja.js b/dist/local/ja.js
@@ -39,11 +39,12 @@
 
         // Default error messages
         messages: {
-            fallback: "このフィールドは有効ではありません",
+            0: "このフィールド",
+            fallback: "{0}は有効ではありません",
             loading: "検証プロセス...",
             error: "ネットワークエラー",
             timeout: "要求がタイムアウトしました",
-            required: "このフィールドは必須です",
+            required: "{0}は必須です",
             remote: "この値が使用されている",
             integer: {
                 '*': "整数を入力してください",

diff --git a/dist/local/zh-CN.js b/dist/local/zh-CN.js
@@ -47,6 +47,7 @@
 
         // Default error messages
         messages: {
+            0: "",
             fallback: "{0}格式不正确",
             loading: "正在验证...",
             error: "网络异常",

diff --git a/dist/local/zh-TW.js b/dist/local/zh-TW.js
@@ -39,6 +39,7 @@
 
         // Default error messages
         messages: {
+            0: "",
             fallback: "{0}格式不正確",
             loading: "正在驗證...",
             error: "網絡異常",

diff --git a/src/jquery.validator.js b/src/jquery.validator.js
@@ -950,7 +950,7 @@
                         5. default message;
                     */
                     msg = (_getDataMsg(el, field, msg || rule.msg || me.messages[method]) || me.messages.fallback).replace(/\{0\|?([^\}]*)\}/, function(){
-                        return me._getDisplay(el, field.display) || arguments[1];
+                        return me._getDisplay(el, field.display) || arguments[1] || me.messages[0];
                     });
                 }
                 if (!isValid) field.isValid = isValid;

diff --git a/src/local/en.js b/src/local/en.js
@@ -19,13 +19,14 @@ exports.rules = {
 };
 
 exports.lang = {
-    fallback: "This field is not valid.",
+    0: 'This field',
+    fallback: "{0} is not valid.",
     loading: "Validating...",
 
     error: "Network Error.",
     timeout: "Request timed out.",
 
-    required: "This field is required.",
+    required: "{0} is required.",
     remote: "Please try another name.",
 
     integer_nzp: "Please enter an integer.",

diff --git a/src/local/ja.js b/src/local/ja.js
@@ -19,15 +19,16 @@ exports.rules = {
 };
 
 exports.lang = {
-    fallback: "このフィールドは有効ではありません",
+    0: "このフィールド",
+    fallback: "{0}は有効ではありません",
     loading: "検証プロセス...",
 
     error: "ネットワークエラー",
     timeout: "要求がタイムアウトしました",
 
     digits: "番号を入力してください",
 
-    required: "このフィールドは必須です",
+    required: "{0}は必須です",
     remote: "この値が使用されている",
 
     integer_nzp: "整数を入力してください",

diff --git a/src/local/zh-CN.js b/src/local/zh-CN.js
@@ -27,6 +27,7 @@ exports.rules = {
 };
 
 exports.lang = {
+    0: "",
     fallback: "{0}格式不正确",
     loading: "正在验证...",
 

diff --git a/src/local/zh-TW.js b/src/local/zh-TW.js
@@ -19,6 +19,7 @@ exports.rules = {
 };
 
 exports.lang = {
+    0: "",
     fallback: "{0}格式不正確",
     loading: "正在驗證...",