Refactor i18n, add templating for resource app

idp/services/i18n.go

@@ -2,85 +2,13 @@ package services
 
 import (
 	"context"
-	"fmt"
 
-	"github.com/BurntSushi/toml"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
-	log "github.com/sirupsen/logrus"
-	"golang.org/x/text/language"
+
+	"git.cacert.org/oidc_login/common/services"
 )
 
-type contextKey int
-
-const (
-	CtxI18nBundle contextKey = iota
-	CtxI18nCatalog
-)
-
-type MessageCatalog struct {
-	messages map[string]*i18n.Message
-	logger   *log.Logger
-}
-
-func (m *MessageCatalog) LookupErrorMessage(tag string, field string, value interface{}, localizer *i18n.Localizer) string {
-	var message *i18n.Message
-	message, ok := m.messages[fmt.Sprintf("%s-%s", field, tag)]
-	if !ok {
-		m.logger.Infof("no specific error message %s-%s", field, tag)
-		message, ok = m.messages[tag]
-		if !ok {
-			m.logger.Infof("no specific error message %s", tag)
-			message, ok = m.messages["unknown"]
-			if !ok {
-				m.logger.Error("no default translation found")
-				return tag
-			}
-		}
-	}
-
-	translation, err := localizer.Localize(&i18n.LocalizeConfig{
-		DefaultMessage: message,
-		TemplateData: map[string]interface{}{
-			"Value": value,
-		},
-	})
-	if err != nil {
-		m.logger.Error(err)
-		return tag
-	}
-	return translation
-}
-
-func (m *MessageCatalog) LookupMessage(id string, templateData map[string]interface{}, localizer *i18n.Localizer) string {
-	if message, ok := m.messages[id]; ok {
-		translation, err := localizer.Localize(&i18n.LocalizeConfig{
-			DefaultMessage: message,
-			TemplateData:   templateData,
-		})
-		if err != nil {
-			m.logger.Error(err)
-			return id
-		}
-		return translation
-	} else {
-		return id
-	}
-}
-
-func InitI18n(ctx context.Context, logger *log.Logger) context.Context {
-	bundle := i18n.NewBundle(language.English)
-	bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
-	_, err := bundle.LoadMessageFile("de.toml")
-	if err != nil {
-		logger.Warnln("message bundle de.toml not found")
-	}
-	catalog := initMessageCatalog(logger)
-	ctx = context.WithValue(ctx, CtxI18nBundle, bundle)
-	ctx = context.WithValue(ctx, CtxI18nCatalog, catalog)
-	return ctx
-}
-
-func initMessageCatalog(logger *log.Logger) *MessageCatalog {
+func AddMessages(ctx context.Context) {
 	messages := make(map[string]*i18n.Message)
 	messages["unknown"] = &i18n.Message{
 		ID:    "ErrorUnknown",
@@ -138,5 +66,5 @@ func initMessageCatalog(logger *log.Logger) *MessageCatalog {
 		ID:    "Scope-email-Description",
 		Other: "Access your primary email address.",
 	}
-	return &MessageCatalog{messages: messages, logger: logger}
+	services.GetMessageCatalog(ctx).AddMessages(messages)
 }