refactor: rewrite localization for dynamic set and get

feat: medley localnames
feat: integrate package minor updates
fix: on errors with blog client init write correct type

1 files changed, 2 insertions, 16 deletions

diff --git a/internal/router/router.go b/internal/router/router.go
index a1208e0..43d6138 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -23,7 +23,6 @@ import (
 	"github.com/SayaAndy/saya-today-web/internal/mailer"
 	"github.com/SayaAndy/saya-today-web/internal/tailwind"
 	"github.com/SayaAndy/saya-today-web/internal/templatemanager"
-	"github.com/SayaAndy/saya-today-web/locale"
 	"github.com/dgraph-io/ristretto/v2"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/compress"
@@ -95,7 +94,6 @@ type Route interface {
 type Supplements struct {
 	DB                 *sql.DB
 	BlogClient         blog.Client
-	Localization       map[string]*locale.LocaleConfig
 	AvailableLanguages []config.AvailableLanguageConfig
 	ClientCache        *ClientCache
 	PageCache          *ristretto.Cache[string, []byte]
@@ -149,16 +147,7 @@ func NewRouter(cfg *config.Config) (*Router, error) {
 
 	supplements.BlogClient, err = blog.NewClientMap[cfg.BlogPages.Storage.Type](&cfg.BlogPages.Storage)
 	if err != nil {
-		return nil, fmt.Errorf("fail to initialize b2 client: %w", err)
-	}
-
-	supplements.Localization = make(map[string]*locale.LocaleConfig, len(cfg.AvailableLanguages))
-	for _, lang := range cfg.AvailableLanguages {
-		localeCfg, err := locale.InitConfig(cfg.LocalePath + lang.LocFile)
-		if err != nil {
-			return nil, fmt.Errorf("fail to initialize a locale: %w", err)
-		}
-		supplements.Localization[lang.Name] = localeCfg
+		return nil, fmt.Errorf("fail to initialize blog client: type %s: %w", cfg.BlogPages.Storage.Type, err)
 	}
 
 	supplements.MarkdownRenderer = goldmark.New(
@@ -200,7 +189,7 @@ func NewRouter(cfg *config.Config) (*Router, error) {
 	}
 
 	supplements.Mailer, err = mailer.NewMailer(supplements.DB, cfg.Mail.ClientHost, cfg.Mail.MailHost,
-		cfg.Mail.PublicName, cfg.Mail.MailAddress, cfg.Mail.Username, cfg.Mail.Password, []byte(cfg.Mail.Salt), supplements.Localization)
+		cfg.Mail.PublicName, cfg.Mail.MailAddress, cfg.Mail.Username, cfg.Mail.Password, []byte(cfg.Mail.Salt))
 	if err != nil {
 		return nil, fmt.Errorf("fail to initialize mailer: %w", err)
 	}
@@ -314,7 +303,6 @@ func (r *Router) InitRoutes() (err error) {
 				}
 
 				defaultMap := fiber.Map{
-					"L":                    r.supplements.Localization[lang],
 					"Lang":                 lang,
 					"Path":                 trimmedPath,
 					"QueryString":          queryString,
@@ -467,7 +455,6 @@ func (r *Router) generalPage(c *fiber.Ctx, route Route, lang string) error {
 	}
 
 	valueMap := fiber.Map{
-		"L":                    r.supplements.Localization[lang],
 		"Lang":                 lang,
 		"Path":                 trimmedPath,
 		"QueryString":          queryString,
@@ -593,7 +580,6 @@ func (r *Router) generalPageSegment(c *fiber.Ctx, part string) error {
 
 	var statusCode int
 	defaultMap := fiber.Map{
-		"L":                    r.supplements.Localization[lang],
 		"Lang":                 lang,
 		"Path":                 strings.Trim(path, "/"),
 		"QueryString":          queryString,