atcoder
diff --git a/Collapse file
‎http.go‎
Copy file name to clipboardExpand all lines: http.go
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎http.go‎
Copy file name to clipboardExpand all lines: http.go
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎validation.go‎
Copy file name to clipboardExpand all lines: validation.go
+43-11Lines changed: 43 additions & 11 deletions b/Collapse file
‎validation.go‎
Copy file name to clipboardExpand all lines: validation.go
+43-11Lines changed: 43 additions & 11 deletions
diff --git a/Collapse file
‎validation_test.go‎
Copy file name to clipboardExpand all lines: validation_test.go
+26-2Lines changed: 26 additions & 2 deletions b/Collapse file
‎validation_test.go‎
Copy file name to clipboardExpand all lines: validation_test.go
+26-2Lines changed: 26 additions & 2 deletions
@@ -413,7 +413,7 @@ func (al AcceptLanguages) String() string {
 func ResolveAcceptLanguage(req *Request) AcceptLanguages {
 	header := req.ServerHeader.Get("Accept-Language")
 	if header == "" {
-		return nil
+		return req.AcceptLanguages
 	}
 
 	acceptLanguageHeaderValues := strings.Split(header, ",")
 
@@ -28,6 +28,8 @@ func (e *ValidationError) String() string {
 // Validation context manages data validation and error messages.
 type Validation struct {
 	Errors []*ValidationError
+	Request *Request
+	Translator func(locale, message string, args ...interface{}) string
 	keep   bool
 }
 
@@ -66,19 +68,31 @@ func (v *Validation) ErrorMap() map[string]*ValidationError {
 
 // Error adds an error to the validation context.
 func (v *Validation) Error(message string, args ...interface{}) *ValidationResult {
-	result := (&ValidationResult{
-		Ok:    false,
-		Error: &ValidationError{},
-	}).Message(message, args...)
+	result := v.ValidationResult(false).Message(message,args...)
 	v.Errors = append(v.Errors, result.Error)
 	return result
 }
-
+// Error adds an error to the validation context.
+func (v *Validation) ErrorKey(message string, args ...interface{}) *ValidationResult {
+	result := v.ValidationResult(false).MessageKey(message,args...)
+	v.Errors = append(v.Errors, result.Error)
+	return result
+}
+// Error adds an error to the validation context.
+func (v *Validation) ValidationResult(ok bool) *ValidationResult {
+	if ok {
+		return &ValidationResult{Ok:ok}
+	} else {
+		return &ValidationResult{Ok:ok, Error: &ValidationError{}, Locale:v.Request.Locale, Translator:v.Translator}
+	}
+}
 // ValidationResult is returned from every validation method.
 // It provides an indication of success, and a pointer to the Error (if any).
 type ValidationResult struct {
 	Error *ValidationError
 	Ok    bool
+	Locale string
+	Translator func(locale, message string, args ...interface{}) string
 }
 
 // Key sets the ValidationResult's Error "key" and returns itself for chaining
@@ -102,6 +116,23 @@ func (r *ValidationResult) Message(message string, args ...interface{}) *Validat
 	return r
 }
 
+// Allow a message key to be passed into the validation result. The Validation has already
+// setup the translator to translate the message key
+func (r *ValidationResult) MessageKey(message string, args ...interface{}) *ValidationResult {
+	if r.Error == nil {
+		return r
+	}
+
+	// If translator found, use that to create the message, otherwise call Message method
+	if r.Translator!=nil {
+		r.Error.Message = r.Translator(r.Locale, message, args...)
+	} else {
+		r.Message(message, args...)
+	}
+
+	return r
+}
+
 // Required tests that the argument is non-nil and non-empty (if string or list)
 func (v *Validation) Required(obj interface{}) *ValidationResult {
 	return v.apply(Required{}, obj)
@@ -177,7 +208,7 @@ func (v *Validation) FilePath(str string, m int) *ValidationResult {
 
 func (v *Validation) apply(chk Validator, obj interface{}) *ValidationResult {
 	if chk.IsSatisfied(obj) {
-		return &ValidationResult{Ok: true}
+		return v.ValidationResult(true)
 	}
 
 	// Get the default key.
@@ -199,10 +230,9 @@ func (v *Validation) apply(chk Validator, obj interface{}) *ValidationResult {
 	v.Errors = append(v.Errors, err)
 
 	// Also return it in the result.
-	return &ValidationResult{
-		Ok:    false,
-		Error: err,
-	}
+	vr := v.ValidationResult(false)
+	vr.Error = err
+	return vr
 }
 
 // Check applies a group of validators to a field, in order, and return the
@@ -224,13 +254,15 @@ func ValidationFilter(c *Controller, fc []Filter) {
 	// If json request, we shall assume json response is intended,
 	// as such no validation cookies should be tied response
 	if c.Params != nil && c.Params.JSON != nil {
-		c.Validation = &Validation{}
+		c.Validation = &Validation{Request:c.Request, Translator:MessageFunc}
 		fc[0](c, fc[1:])
 	} else {
 		errors, err := restoreValidationErrors(c.Request)
 		c.Validation = &Validation{
 			Errors: errors,
 			keep:   false,
+			Request:c.Request,
+			Translator:MessageFunc,
 		}
 		hasCookie := (err != http.ErrNoCookie)
 
 
@@ -21,12 +21,13 @@ func getRecordedCookie(recorder *httptest.ResponseRecorder, name string) (*http.
 	}
 	return nil, http.ErrNoCookie
 }
-
+// r.Original.URL.String()
 func validationTester(req *Request, fn func(c *Controller)) *httptest.ResponseRecorder {
 	recorder := httptest.NewRecorder()
 	c := NewTestController(recorder,req.In.GetRaw().(*http.Request))
+	c.Request = req
 
-	ValidationFilter(c, []Filter{func(c *Controller, _ []Filter) {
+	ValidationFilter(c, []Filter{I18nFilter, func(c *Controller, _ []Filter) {
 		fn(c)
 	}})
 	return recorder
@@ -79,3 +80,26 @@ func TestValidationNoKeepCookiePreviouslySet(t *testing.T) {
 		t.Fatalf("cookie should be deleted")
 	}
 }
+
+func TestValidateMessageKey(t *testing.T) {
+	Init("prod", "github.com/revel/revel/testdata", "")
+	loadMessages(testDataPath)
+
+	// Assert that we have the expected number of languages
+	if len(MessageLanguages()) != 2 {
+		t.Fatalf("Expected messages to contain no more or less than 2 languages, instead there are %d languages", len(MessageLanguages()))
+	}
+	req := buildRequestWithAcceptLanguages("nl").Request
+
+	validationTester(req, func(c *Controller) {
+		c.Validation.Required("").MessageKey("greeting")
+		if msg:=c.Validation.Errors[0].Message; msg!="Hallo" {
+			t.Errorf("Failed expected message Hallo got %s", msg)
+		}
+
+		if !c.Validation.HasErrors() {
+			t.Fatal("errors should not be present")
+		}
+	})
+
+}
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ func (al AcceptLanguages) String() string {`
`413`	`413`	`func ResolveAcceptLanguage(req *Request) AcceptLanguages {`
`414`	`414`	`header := req.ServerHeader.Get("Accept-Language")`
`415`	`415`	`if header == "" {`
`416`		`- return nil`
	`416`	`+ return req.AcceptLanguages`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`acceptLanguageHeaderValues := strings.Split(header, ",")`