Add proper Language and Languages types

1 files changed, 67 insertions, 18 deletions

diff --git a/hugolib/multilingual.go b/hugolib/multilingual.go
index 2552bad4c..eebd43e3d 100644
--- a/hugolib/multilingual.go
+++ b/hugolib/multilingual.go
@@ -1,43 +1,80 @@
 package hugolib
 
 import (
+	"sync"
+
+	"strings"
+
 	"github.com/spf13/cast"
 	"github.com/spf13/viper"
 )
 
+type Language struct {
+	Lang       string
+	Title      string
+	Weight     int
+	params     map[string]interface{}
+	paramsInit sync.Once
+}
+
+func NewLanguage(lang string) *Language {
+	return &Language{Lang: lang, params: make(map[string]interface{})}
+}
+
+type Languages []*Language
+
+func (l Languages) Len() int           { return len(l) }
+func (l Languages) Less(i, j int) bool { return l[i].Weight < l[j].Weight }
+func (l Languages) Swap(i, j int)      { l[i], l[j] = l[j], l[i] }
+
 type Multilingual struct {
 	enabled bool
-	config  *viper.Viper
 
-	Languages []string
+	Languages Languages
+}
+
+func (l *Language) Params() map[string]interface{} {
+	l.paramsInit.Do(func() {
+		// Merge with global config.
+		// TODO(bep) consider making this part of a constructor func.
+		globalParams := viper.GetStringMap("Params")
+		for k, v := range globalParams {
+			if _, ok := l.params[k]; !ok {
+				l.params[k] = v
+			}
+		}
+	})
+	return l.params
 }
 
-func (ml *Multilingual) GetString(key string) string { return cast.ToString(ml.Get(key)) }
-func (ml *Multilingual) GetStringMap(key string) map[string]interface{} {
+func (l *Language) SetParam(k string, v interface{}) {
+	l.params[k] = v
+}
+
+func (l *Language) GetString(key string) string { return cast.ToString(l.Get(key)) }
+func (ml *Language) GetStringMap(key string) map[string]interface{} {
 	return cast.ToStringMap(ml.Get(key))
 }
 
-func (ml *Multilingual) GetStringMapString(key string) map[string]string {
-	return cast.ToStringMapString(ml.Get(key))
+func (l *Language) GetStringMapString(key string) map[string]string {
+	return cast.ToStringMapString(l.Get(key))
 }
 
-func (ml *Multilingual) Get(key string) interface{} {
-	if ml != nil && ml.config != nil && ml.config.IsSet(key) {
-		return ml.config.Get(key)
+func (l *Language) Get(key string) interface{} {
+	key = strings.ToLower(key)
+	if v, ok := l.params[key]; ok {
+		return v
 	}
 	return viper.Get(key)
 }
 
-func (s *Site) SetMultilingualConfig(currentLang string, orderedLanguages []string, langConfigs map[string]interface{}) {
-	conf := viper.New()
-	for k, val := range cast.ToStringMap(langConfigs[currentLang]) {
-		conf.Set(k, val)
-	}
-	conf.Set("CurrentLanguage", currentLang)
+func (s *Site) SetMultilingualConfig(currentLang *Language, languages Languages) {
+
+	// TODO(bep) multilingo evaluate
+	viper.Set("CurrentLanguage", currentLang)
 	ml := &Multilingual{
-		enabled:   len(langConfigs) > 0,
-		config:    conf,
-		Languages: orderedLanguages,
+		enabled:   len(languages) > 0,
+		Languages: languages,
 	}
 	viper.Set("Multilingual", ml.enabled)
 	s.Multilingual = ml
@@ -46,3 +83,15 @@ func (s *Site) SetMultilingualConfig(currentLang string, orderedLanguages []stri
 func (s *Site) multilingualEnabled() bool {
 	return s.Multilingual != nil && s.Multilingual.enabled
 }
+
+func currentLanguageString() string {
+	return currentLanguage().Lang
+}
+
+func currentLanguage() *Language {
+	l := viper.Get("CurrentLanguage")
+	if l == nil {
+		panic("CurrentLanguage not set")
+	}
+	return l.(*Language)
+}