go-packages/iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-02-02 15:30:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add ctx.Tr support to hero/mvc.Response

Browse Source 
Former-commit-id: f5e60e591dbbb162af1d671706a108a795865516
This commit is contained in:
Gerasimos (Makis) Maropoulos 2020-05-06 06:36:05 +03:00
parent ffc493a0b9
commit 24665990ce
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hero/func_result.go
View File

@ -372,11 +372,20 @@ type Response struct {
ContentType string ContentType string
Content []byte Content []byte
// if not empty then content type is the text/plain // If not empty then content type is the "text/plain"
// and content is the text as []byte. // and content is the text as []byte. If not empty and
// the "Lang" field is not empty then this "Text" field
// becomes the current locale file's key.
Text string Text string
// If not nil then it will fire that as "application/json" or the // If not empty then "Text" field becomes the locale file's key that should point
// "ContentType" if not empty. // to a translation file's unique key. See `Object` for locale template data.
// The "Lang" field is the language code
// that should render the text inside the locale file's key.
Lang string
// If not nil then it will fire that as "application/json" or any
// previously set "ContentType". If "Lang" and "Text" are not empty
// then this "Object" field becomes the template data that the
// locale text should use to be rendered.
Object interface{} Object interface{}
// If Path is not empty then it will redirect // If Path is not empty then it will redirect
@ -407,7 +416,11 @@ var _ Result = Response{}
// Dispatch writes the response result to the context's response writer. // Dispatch writes the response result to the context's response writer.
func (r Response) Dispatch(ctx context.Context) { func (r Response) Dispatch(ctx context.Context) {
if r.Path != "" && r.Err == nil { if dispatchErr(ctx, r.Code, r.Err) {
return
}
if r.Path != "" {
// it's not a redirect valid status // it's not a redirect valid status
if r.Code < 300 || r.Code >= 400 { if r.Code < 300 || r.Code >= 400 {
if ctx.Method() == "POST" { if ctx.Method() == "POST" {
@ -419,12 +432,19 @@ func (r Response) Dispatch(ctx context.Context) {
return return
} }
if s := r.Text; s != "" { if r.Text != "" {
r.Content = []byte(s) if r.Lang != "" {
} if r.Code > 0 {
ctx.StatusCode(r.Code)
}
ctx.ContentType(r.ContentType)
if dispatchErr(ctx, r.Code, r.Err) { ctx.SetLanguage(r.Lang)
return r.Content = []byte(ctx.Tr(r.Text, r.Object))
return
}
r.Content = []byte(r.Text)
} }
err := dispatchCommon(ctx, r.Code, r.ContentType, r.Content, r.Object, defaultResultHandler, true) err := dispatchCommon(ctx, r.Code, r.ContentType, r.Content, r.Object, defaultResultHandler, true)