Merge pull request #164 from OscarVanL/master

data_source.go

@@ -431,6 +431,7 @@ func (d *StructData) parseRulesFromTag(v *Validation) {
 // eg: `message:"required:name is required|minLen:name min len is %d"`
 func (d *StructData) loadMessagesFromTag(trans *Translator, field, vRule, vMsg string) {
 	var msgKey, vName string
+	var vNames []string
 
 	// only one message, use for first validator.
 	// eg: `message:"name is required"`
@@ -439,32 +440,37 @@ func (d *StructData) loadMessagesFromTag(trans *Translator, field, vRule, vMsg s
 		if strings.ContainsRune(vMsg, ':') {
 			nodes := strings.SplitN(vMsg, ":", 2)
 			vName = strings.TrimSpace(nodes[0])
+			vNames = []string{vName}
 			// first is validator name
 			vMsg = strings.TrimSpace(nodes[1])
 		}
 
 		if vName == "" {
 			// eg `validate:"required|date"`
-			vName = vRule
+			vNames = []string{vRule}
+
 			if strings.ContainsRune(vRule, '|') {
-				nodes := strings.SplitN(vRule, "|", 2)
-				vName = nodes[0]
+				vNames = strings.Split(vRule, "|")
 			}
 
-			// has params for validator: "minLen:5"
-			if strings.ContainsRune(vName, ':') {
-				nodes := strings.SplitN(vRule, ":", 2)
-				vName = nodes[0]
+			for i, node := range vNames {
+				// has params for validator: "minLen:5"
+				if strings.ContainsRune(node, ':') {
+					tmp := strings.SplitN(node, ":", 2)
+					vNames[i] = tmp[0]
+				}
 			}
 		}
 
 		// if rName, has := validatorAliases[validator]; has {
 		// 	msgKey = field + "." + rName
 		// } else {
-		msgKey = field + "." + vName
-		// }
 
-		trans.AddMessage(msgKey, vMsg)
+		for _, name := range vNames {
+			msgKey = field + "." + name
+			trans.AddMessage(msgKey, vMsg)
+		}
+
 		return
 	}
 

messages_test.go

@@ -155,6 +155,32 @@ func TestMessageOnStruct(t *testing.T) {
 	v = Struct(s4)
 	is.False(v.Validate())
 	is.Equal("出生日期有误", v.Errors.One())
+
+	// Ensure message override with no specified field applies to all validation errors if SkipOnError=false is set in
+	// global options
+	Config(func(opt *GlobalOption) {
+		opt.StopOnError = false
+	})
+
+	s5 := &struct {
+		Name     string `validate:"string"`
+		BirthDay string `validate:"max_len:1|date" message:"出生日期有误"`
+	}{
+		"tom",
+		"ff",
+	}
+
+	v = Struct(s5)
+
+	is.False(v.Validate())
+	is.Contains(v.Errors.String(), "BirthDay")
+	is.Contains(v.Errors.String(), "max_len: 出生日期有误")
+	is.Contains(v.Errors.String(), "date: 出生日期有误")
+
+	// Restore original global options
+	Config(func(opt *GlobalOption) {
+		opt.StopOnError = true
+	})
 }
 
 // with field tag: json