update

Author: admpub

middleware/language/config.go

@@ -19,6 +19,7 @@ package language
 import (
 	"net/http"
 
+	"github.com/webx-top/echo"
 	"github.com/webx-top/echo/param"
 )
 
@@ -49,6 +50,31 @@ type Config struct {
 	// Reload indicates whether to reload the language file each time it is modified.
 	Reload bool
 	fsFunc func(string) http.FileSystem
+	kvList echo.KVList
+}
+
+func (c *Config) Init() {
+	c.kvList = make(echo.KVList, len(c.AllList))
+	for index, lang := range c.AllList {
+		extra := c.ExtraBy(lang)
+		label := extra.String(`label`)
+		if len(label) == 0 {
+			label = lang
+		}
+		flag := extra.String(`flag`)
+		var kv *echo.KV
+		if len(flag) > 0 {
+			kv = echo.NewKV(lang, flag+` `+label)
+		} else {
+			kv = echo.NewKV(lang, label)
+		}
+		kv.SetH(extra)
+		c.kvList[index] = kv
+	}
+}
+
+func (c Config) KVList() echo.KVList {
+	return c.kvList
 }
 
 func (c *Config) SetFSFunc(fsFunc func(string) http.FileSystem) *Config {
@@ -57,13 +83,13 @@ func (c *Config) SetFSFunc(fsFunc func(string) http.FileSystem) *Config {
 }
 
 // FSFunc returns the configured http.FileSystem function.
-func (c *Config) FSFunc() func(string) http.FileSystem {
+func (c Config) FSFunc() func(string) http.FileSystem {
 	return c.fsFunc
 }
 
 // ExtraBy returns the extra parameters for the specified language.
 // If no extra parameters exist for the language or Extra is nil, returns an empty Store.
-func (c *Config) ExtraBy(lang string) param.Store {
+func (c Config) ExtraBy(lang string) param.Store {
 	if c.Extra == nil {
 		return param.Store{}
 	}
@@ -73,7 +99,7 @@ func (c *Config) ExtraBy(lang string) param.Store {
 	return param.Store{}
 }
 
-func (c *Config) Clone() Config {
+func (c Config) Clone() Config {
 	cfg := Config{
 		Project:      c.Project,
 		Default:      c.Default,
@@ -84,12 +110,17 @@ func (c *Config) Clone() Config {
 		MessagesPath: make([]string, len(c.MessagesPath)),
 		Reload:       c.Reload,
 		fsFunc:       c.fsFunc,
+		kvList:       make(echo.KVList, len(c.kvList)),
 	}
 	copy(cfg.AllList, c.AllList)
 	copy(cfg.RulesPath, c.RulesPath)
 	copy(cfg.MessagesPath, c.MessagesPath)
 	for k, v := range c.Extra {
 		cfg.Extra[k] = v.Clone()
 	}
+	for k, v := range c.kvList {
+		cloned := v.Clone()
+		cfg.kvList[k] = &cloned
+	}
 	return cfg
 }

middleware/language/language.go

@@ -76,6 +76,7 @@ func (a *Language) Init(c *Config) {
 			a.Set(`en`, true)
 		}
 	}
+	c.Init()
 	a.I18n = NewI18n(c)
 	if c.Reload {
 		a.I18n.Monitor()