dalu/i18n
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Darko Luketic 2017-12-30 13:49:23 +01:00
parent eec3f7da65
commit a8a4165664
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
i18n.go
View File

@ -1,12 +1,14 @@
package i18n package i18n
import ( import (
"log"
"github.com/nicksnyder/go-i18n/i18n/bundle"
"net/http"
"context" "context"
"log"
"net/http"
"github.com/nicksnyder/go-i18n/i18n/bundle"
) )
// Config is the configuration struct of the middleware
type Config struct { type Config struct {
DefaultLanguage string DefaultLanguage string
Files []string // files to load Files []string // files to load
@ -16,10 +18,12 @@ type Config struct {
bundle *bundle.Bundle bundle *bundle.Bundle
} }
// I18nMiddleware is the middleware that encapsulates the config
type I18nMiddleware struct { type I18nMiddleware struct {
config Config config Config
} }
// New creates a new Middleware. It requires a Config parameter.
func New(c Config) *I18nMiddleware { func New(c Config) *I18nMiddleware {
if c.DefaultLanguage == "" { if c.DefaultLanguage == "" {
log.Fatal("i18n: No default language set") log.Fatal("i18n: No default language set")
@ -49,13 +53,14 @@ func New(c Config) *I18nMiddleware {
return &I18nMiddleware{config: c} return &I18nMiddleware{config: c}
} }
// Middleware is a http.Handler compatible middleware
func (i *I18nMiddleware) Middleware(next http.Handler) http.Handler { func (i *I18nMiddleware) Middleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
bycookie := false bycookie := false
lang := r.URL.Query().Get(i.config.URLParam) lang := r.URL.Query().Get(i.config.URLParam)
rlang := r.Header.Get("Accept-Language") rlang := r.Header.Get("Accept-Language")
if lang == "" { if lang == "" {
lc ,e := r.Cookie("lang") lc, e := r.Cookie("lang")
if e != nil { if e != nil {
lang = "" lang = ""
} else { } else {
@ -64,8 +69,9 @@ func (i *I18nMiddleware) Middleware(next http.Handler) http.Handler {
} }
} }
if !bycookie { if !bycookie {
http.SetCookie(w, &http.Cookie{HttpOnly:true, Name: "lang", Value:lang}) http.SetCookie(w, &http.Cookie{HttpOnly: true, Name: "lang", Value: lang})
} }
ctx0 := context.WithValue(r.Context(), "i18nlang", lang) ctx0 := context.WithValue(r.Context(), "i18nlang", lang)
ctx1 := context.WithValue(ctx0, "i18nrlang", rlang) ctx1 := context.WithValue(ctx0, "i18nrlang", rlang)
ctx2 := context.WithValue(ctx1, "i18ndlang", i.config.DefaultLanguage) ctx2 := context.WithValue(ctx1, "i18ndlang", i.config.DefaultLanguage)
@ -74,13 +80,14 @@ func (i *I18nMiddleware) Middleware(next http.Handler) http.Handler {
}) })
} }
// MiddlewareFunc is a http.HandlerFunc compatible middleware
func (i *I18nMiddleware) MiddlewareFunc(next http.HandlerFunc) http.HandlerFunc { func (i *I18nMiddleware) MiddlewareFunc(next http.HandlerFunc) http.HandlerFunc {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
bycookie := false bycookie := false
lang := r.URL.Query().Get(i.config.URLParam) lang := r.URL.Query().Get(i.config.URLParam)
rlang := r.Header.Get("Accept-Language") rlang := r.Header.Get("Accept-Language")
if lang == "" { if lang == "" {
lc ,e := r.Cookie("lang") lc, e := r.Cookie("lang")
if e != nil { if e != nil {
lang = "" lang = ""
} else { } else {
@ -89,7 +96,7 @@ func (i *I18nMiddleware) MiddlewareFunc(next http.HandlerFunc) http.HandlerFunc
} }
} }
if !bycookie { if !bycookie {
http.SetCookie(w, &http.Cookie{HttpOnly:true, Name: "lang", Value:lang}) http.SetCookie(w, &http.Cookie{HttpOnly: true, Name: "lang", Value: lang})
} }
ctx0 := context.WithValue(r.Context(), "i18nlang", lang) ctx0 := context.WithValue(r.Context(), "i18nlang", lang)
ctx1 := context.WithValue(ctx0, "i18nrlang", rlang) ctx1 := context.WithValue(ctx0, "i18nrlang", rlang)