go/golang-saas-starter-kit
1
0
Fork 0
mirror of https://github.com/raseels-repos/golang-saas-starter-kit.git synced 2025-08-08 22:36:41 +02:00
Code Issues Releases Activity

web-app: fix translator mid query/accept option

Browse Source
This commit is contained in:
jsign
2019-08-19 17:41:15 -03:00
parent 869a999e8a
commit 1229cf0404
1 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
internal/mid/translator.go
View File

@ -6,11 +6,14 @@ import (
"geeks-accelerator/oss/saas-starter-kit/internal/platform/web" "geeks-accelerator/oss/saas-starter-kit/internal/platform/web"
"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext" "geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext"
httpext "github.com/go-playground/pkg/net/http" httpext "github.com/go-playground/pkg/net/http"
ut "github.com/go-playground/universal-translator" ut "github.com/go-playground/universal-translator"
"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer" "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
) )
// Translator enables configuration of a language translator configured by
// query parameter or accept language header.
func Translator(utrans *ut.UniversalTranslator) web.Middleware { func Translator(utrans *ut.UniversalTranslator) web.Middleware {
// This is the actual middleware function to be executed. // This is the actual middleware function to be executed.
@ -21,34 +24,17 @@ func Translator(utrans *ut.UniversalTranslator) web.Middleware {
span, ctx := tracer.StartSpanFromContext(ctx, "internal.mid.Translator") span, ctx := tracer.StartSpanFromContext(ctx, "internal.mid.Translator")
defer span.Finish() defer span.Finish()
m := func() error { var t ut.Translator
locale, _ := params["locale"] var queryLocaleFound bool
if locale := r.URL.Query().Get("locale"); locale != "" {
t, queryLocaleFound = utrans.GetTranslator(locale)
}
var t ut.Translator if !queryLocaleFound {
if len(locale) > 0 {
var found bool
if t, found = utrans.GetTranslator(locale); found {
goto END
}
}
// get and parse the "Accept-Language" http header and return an array
t, _ = utrans.FindTranslator(httpext.AcceptedLanguages(r)...) t, _ = utrans.FindTranslator(httpext.AcceptedLanguages(r)...)
END:
ctx = webcontext.ContextWithTranslator(ctx, t)
return nil
} }
if err := m(); err != nil { ctx = webcontext.ContextWithTranslator(ctx, t)
if web.RequestIsJson(r) {
return web.RespondJsonError(ctx, w, err)
}
return err
}
return after(ctx, w, r, params) return after(ctx, w, r, params)
} }