feat: redo language page with general page layout

11 files changed, 142 insertions, 73 deletions

diff --git a/internal/factgiver/factgiver.go b/internal/factgiver/factgiver.go
index 6f77403..5b418ee 100644
--- a/internal/factgiver/factgiver.go
+++ b/internal/factgiver/factgiver.go
@@ -14,13 +14,13 @@ import (
 type FactGiver struct {
 	b2Client      *b2.B2Client
 	cache         map[string][]string
-	langs         []string
+	langs         []config.AvailableLanguageConfig
 	factsFileName string
 	nlRe          *regexp.Regexp
 	randGen       *rand.Rand
 }
 
-func NewFactGiver(cfg *config.FactGiverConfig, langs []string) (*FactGiver, error) {
+func NewFactGiver(cfg *config.FactGiverConfig, langs []config.AvailableLanguageConfig) (*FactGiver, error) {
 	b2Client, err := b2.NewB2Client(&cfg.Storage.Config)
 	if err != nil {
 		return nil, fmt.Errorf("fail to init b2 client for a new fact giver: %s", err.Error())
@@ -52,15 +52,15 @@ func (g *FactGiver) Give(lang string) [3]string {
 
 func (g *FactGiver) initCache() error {
 	for _, lang := range g.langs {
-		localFacts := strings.Replace(g.factsFileName, "*", lang, 1)
+		localFacts := strings.Replace(g.factsFileName, "*", lang.Name, 1)
 		factsContentBytes, err := g.b2Client.ReadAll(localFacts)
 		if err != nil {
-			return fmt.Errorf("fail to read '%s' facts file: %s", lang, err.Error())
+			return fmt.Errorf("fail to read '%s' facts file: %s", lang.Name, err.Error())
 		}
 		factsContent := string(factsContentBytes)
-		g.cache[lang] = g.nlRe.Split(factsContent, -1)
-		if g.cache[lang][len(g.cache[lang])-1] == "" {
-			g.cache[lang] = g.cache[lang][:len(g.cache[lang])-1]
+		g.cache[lang.Name] = g.nlRe.Split(factsContent, -1)
+		if g.cache[lang.Name][len(g.cache[lang.Name])-1] == "" {
+			g.cache[lang.Name] = g.cache[lang.Name][:len(g.cache[lang.Name])-1]
 		}
 	}
 	return nil
diff --git a/internal/router/api-v1-blog-search.go b/internal/router/api-v1-blog-search.go
index 69be651..ab5425c 100644
--- a/internal/router/api-v1-blog-search.go
+++ b/internal/router/api-v1-blog-search.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/SayaAndy/saya-today-web/config"
 	"github.com/SayaAndy/saya-today-web/internal/b2"
 	"github.com/SayaAndy/saya-today-web/locale"
 	"github.com/gofiber/fiber/v2"
@@ -19,17 +20,21 @@ func init() {
 	tm.Add("catalogue-blog-cards", "views/partials/catalogue-blog-cards.html", "views/partials/catalogue-blog-card-tags.html")
 }
 
-func Api_V1_BlogSearch(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error {
+func Api_V1_BlogSearch(l map[string]*locale.LocaleConfig, langs []config.AvailableLanguageConfig, b2Client *b2.B2Client) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
 		sort := c.Query("sort")
 		lang := c.Query("lang")
 		tz := c.Query("tz")
 
-		if !slices.Contains(langs, lang) {
-			c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
-			return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language", lang))
+		for _, availableLang := range langs {
+			if availableLang.Name == lang {
+				goto langIsAvailable
+			}
 		}
+		c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
+		return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language", lang))
 
+	langIsAvailable:
 		loc, err := time.LoadLocation(tz)
 		if err != nil {
 			loc = time.UTC
diff --git a/internal/router/api-v1-general-page-body.go b/internal/router/api-v1-general-page-body.go
index c1a4a9f..fe21957 100644
--- a/internal/router/api-v1-general-page-body.go
+++ b/internal/router/api-v1-general-page-body.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/SayaAndy/saya-today-web/config"
 	"github.com/SayaAndy/saya-today-web/internal/b2"
 	"github.com/SayaAndy/saya-today-web/internal/factgiver"
 	"github.com/SayaAndy/saya-today-web/locale"
@@ -24,7 +25,7 @@ func init() {
 	tm.Add("general-page-body", "views/partials/general-page-body.html")
 }
 
-func Api_V1_GeneralPage_Body(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client, md goldmark.Markdown) func(c *fiber.Ctx) error {
+func Api_V1_GeneralPage_Body(l map[string]*locale.LocaleConfig, langs []config.AvailableLanguageConfig, b2Client *b2.B2Client, md goldmark.Markdown) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
 		c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
 
@@ -45,19 +46,26 @@ func Api_V1_GeneralPage_Body(l map[string]*locale.LocaleConfig, langs []string,
 			return c.Status(fiber.StatusOK).Type("html").Send(val)
 		}
 
+		lang := ""
 		pathParts := strings.Split(strings.Trim(path, "/"), "/")
-		if len(pathParts) == 0 {
-			return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'")
+		if len(pathParts) == 1 && pathParts[0] == "" {
+			pathParts = []string{}
 		}
-
-		lang := pathParts[0]
-		if !slices.Contains(langs, lang) {
-			return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang))
+		if len(pathParts) > 0 {
+			lang = pathParts[0]
+			for _, availableLang := range langs {
+				if availableLang.Name == lang {
+					goto langIsAvailable
+				}
+			}
+			return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'")
 		}
 
+	langIsAvailable:
 		values := fiber.Map{
 			"L":           l[lang],
 			"Lang":        lang,
+			"Path":        strings.Trim(path, "/"),
 			"QueryString": string(c.Request().URI().QueryString()),
 		}
 		var additionalTemplates []string
@@ -149,6 +157,10 @@ func Api_V1_GeneralPage_Body(l map[string]*locale.LocaleConfig, langs []string,
 			values["GifName"] = fmt.Sprintf("otter-%d.gif", rand.Int()%3+1)
 			values["FunFacts"] = FactGiver.Give(lang)
 			additionalTemplates = append(additionalTemplates, "views/pages/home-page.html")
+		} else if len(pathParts) == 0 {
+			values["Title"] = "Choose Your Language"
+			values["AvailableLanguages"] = langs
+			additionalTemplates = append(additionalTemplates, "views/pages/language-pick.html")
 		}
 
 		content, err := tm.Render("general-page-body", values, additionalTemplates...)
diff --git a/internal/router/api-v1-general-page-bottom-embeds.go b/internal/router/api-v1-general-page-bottom-embeds.go
index c4d9543..0a2030f 100644
--- a/internal/router/api-v1-general-page-bottom-embeds.go
+++ b/internal/router/api-v1-general-page-bottom-embeds.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"log/slog"
 	"net/url"
-	"slices"
 	"strings"
 	"time"
 
+	"github.com/SayaAndy/saya-today-web/config"
 	"github.com/SayaAndy/saya-today-web/internal/b2"
 	"github.com/SayaAndy/saya-today-web/locale"
 	"github.com/gofiber/fiber/v2"
@@ -17,7 +17,7 @@ func init() {
 	tm.Add("general-page-bottom-embeds", "views/partials/general-page-bottom-embeds.html")
 }
 
-func Api_V1_GeneralPage_BottomEmbeds(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error {
+func Api_V1_GeneralPage_BottomEmbeds(l map[string]*locale.LocaleConfig, langs []config.AvailableLanguageConfig, b2Client *b2.B2Client) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
 		c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
 
@@ -37,19 +37,26 @@ func Api_V1_GeneralPage_BottomEmbeds(l map[string]*locale.LocaleConfig, langs []
 			return c.Status(fiber.StatusOK).Type("html").Send(val)
 		}
 
+		lang := ""
 		pathParts := strings.Split(strings.Trim(path, "/"), "/")
-		if len(pathParts) == 0 {
-			return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'")
+		if len(pathParts) == 1 && pathParts[0] == "" {
+			pathParts = []string{}
 		}
-
-		lang := pathParts[0]
-		if !slices.Contains(langs, lang) {
-			return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang))
+		if len(pathParts) > 0 {
+			lang = pathParts[0]
+			for _, availableLang := range langs {
+				if availableLang.Name == lang {
+					goto langIsAvailable
+				}
+			}
+			return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'")
 		}
 
+	langIsAvailable:
 		values := fiber.Map{
 			"L":           l[lang],
 			"Lang":        lang,
+			"Path":        strings.Trim(path, "/"),
 			"QueryString": string(c.Request().URI().QueryString()),
 		}
 		var additionalTemplates []string
@@ -60,6 +67,8 @@ func Api_V1_GeneralPage_BottomEmbeds(l map[string]*locale.LocaleConfig, langs []
 			additionalTemplates = append(additionalTemplates, "views/pages/blog-page.html")
 		} else if len(pathParts) == 1 {
 			additionalTemplates = append(additionalTemplates, "views/pages/home-page.html")
+		} else if len(pathParts) == 0 {
+			additionalTemplates = append(additionalTemplates, "views/pages/language-pick.html")
 		}
 
 		content, err := tm.Render("general-page-bottom-embeds", values, additionalTemplates...)
diff --git a/internal/router/api-v1-general-page-footer.go b/internal/router/api-v1-general-page-footer.go
index 003f54c..2030b3b 100644
--- a/internal/router/api-v1-general-page-footer.go
+++ b/internal/router/api-v1-general-page-footer.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"log/slog"
 	"net/url"
-	"slices"
 	"strings"
 	"time"
 
+	"github.com/SayaAndy/saya-today-web/config"
 	"github.com/SayaAndy/saya-today-web/locale"
 	"github.com/gofiber/fiber/v2"
 )
@@ -16,7 +16,7 @@ func init() {
 	tm.Add("general-page-footer", "views/partials/general-page-footer.html")
 }
 
-func Api_V1_GeneralPage_Footer(l map[string]*locale.LocaleConfig, langs []string) func(c *fiber.Ctx) error {
+func Api_V1_GeneralPage_Footer(l map[string]*locale.LocaleConfig, langs []config.AvailableLanguageConfig) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
 		c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
 
@@ -37,19 +37,26 @@ func Api_V1_GeneralPage_Footer(l map[string]*locale.LocaleConfig, langs []string
 			return c.Status(fiber.StatusOK).Type("html").Send(val)
 		}
 
+		lang := ""
 		pathParts := strings.Split(strings.Trim(path, "/"), "/")
-		if len(pathParts) == 0 {
-			return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'")
+		if len(pathParts) == 1 && pathParts[0] == "" {
+			pathParts = []string{}
 		}
-
-		lang := pathParts[0]
-		if !slices.Contains(langs, lang) {
-			return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang))
+		if len(pathParts) > 0 {
+			lang = pathParts[0]
+			for _, availableLang := range langs {
+				if availableLang.Name == lang {
+					goto langIsAvailable
+				}
+			}
+			return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'")
 		}
 
+	langIsAvailable:
 		values := fiber.Map{
 			"L":           l[lang],
 			"Lang":        lang,
+			"Path":        strings.Trim(path, "/"),
 			"QueryString": string(c.Request().URI().QueryString()),
 		}
 		var additionalTemplates []string
@@ -60,6 +67,8 @@ func Api_V1_GeneralPage_Footer(l map[string]*locale.LocaleConfig, langs []string
 			additionalTemplates = append(additionalTemplates, "views/pages/blog-page.html")
 		} else if len(pathParts) == 1 {
 			additionalTemplates = append(additionalTemplates, "views/pages/home-page.html")
+		} else if len(pathParts) == 0 {
+			additionalTemplates = append(additionalTemplates, "views/pages/language-pick.html")
 		}
 
 		content, err := tm.Render("general-page-footer", values, additionalTemplates...)
diff --git a/internal/router/api-v1-general-page-header.go b/internal/router/api-v1-general-page-header.go
index 80228f7..a2c832b 100644
--- a/internal/router/api-v1-general-page-header.go
+++ b/internal/router/api-v1-general-page-header.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"log/slog"
 	"net/url"
-	"slices"
 	"strings"
 	"time"
 
+	"github.com/SayaAndy/saya-today-web/config"
 	"github.com/SayaAndy/saya-today-web/internal/b2"
 	"github.com/SayaAndy/saya-today-web/locale"
 	"github.com/gofiber/fiber/v2"
@@ -17,7 +17,7 @@ func init() {
 	tm.Add("general-page-header", "views/partials/general-page-header.html")
 }
 
-func Api_V1_GeneralPage_Header(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error {
+func Api_V1_GeneralPage_Header(l map[string]*locale.LocaleConfig, langs []config.AvailableLanguageConfig, b2Client *b2.B2Client) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
 		c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
 
@@ -38,19 +38,26 @@ func Api_V1_GeneralPage_Header(l map[string]*locale.LocaleConfig, langs []string
 			return c.Status(fiber.StatusOK).Type("html").Send(val)
 		}
 
+		lang := ""
 		pathParts := strings.Split(strings.Trim(path, "/"), "/")
-		if len(pathParts) == 0 {
-			return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'")
+		if len(pathParts) == 1 && pathParts[0] == "" {
+			pathParts = []string{}
 		}
-
-		lang := pathParts[0]
-		if !slices.Contains(langs, lang) {
-			return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang))
+		if len(pathParts) > 0 {
+			lang = pathParts[0]
+			for _, availableLang := range langs {
+				if availableLang.Name == lang {
+					goto langIsAvailable
+				}
+			}
+			return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'")
 		}
 
+	langIsAvailable:
 		values := fiber.Map{
 			"L":           l[lang],
 			"Lang":        lang,
+			"Path":        strings.Trim(path, "/"),
 			"QueryString": string(c.Request().URI().QueryString()),
 		}
 		var additionalTemplates []string
@@ -70,6 +77,9 @@ func Api_V1_GeneralPage_Header(l map[string]*locale.LocaleConfig, langs []string
 		} else if len(pathParts) == 1 {
 			values["Title"] = l[lang].HomePage.Header
 			additionalTemplates = append(additionalTemplates, "views/pages/home-page.html")
+		} else if len(pathParts) == 0 {
+			values["Title"] = "Choose Your Language"
+			additionalTemplates = append(additionalTemplates, "views/pages/language-pick.html")
 		}
 
 		content, err := tm.Render("general-page-header", values, additionalTemplates...)
diff --git a/internal/router/api-v1-general-page-top-embeds.go b/internal/router/api-v1-general-page-top-embeds.go
index 78021b2..544e3a4 100644
--- a/internal/router/api-v1-general-page-top-embeds.go
+++ b/internal/router/api-v1-general-page-top-embeds.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"log/slog"
 	"net/url"
-	"slices"
 	"strings"
 	"time"
 
+	"github.com/SayaAndy/saya-today-web/config"
 	"github.com/SayaAndy/saya-today-web/locale"
 	"github.com/gofiber/fiber/v2"
 )
@@ -16,7 +16,7 @@ func init() {
 	tm.Add("general-page-top-embeds", "views/partials/general-page-top-embeds.html")
 }
 
-func Api_V1_GeneralPage_TopEmbeds(l map[string]*locale.LocaleConfig, langs []string) func(c *fiber.Ctx) error {
+func Api_V1_GeneralPage_TopEmbeds(l map[string]*locale.LocaleConfig, langs []config.AvailableLanguageConfig) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
 		c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
 
@@ -37,19 +37,26 @@ func Api_V1_GeneralPage_TopEmbeds(l map[string]*locale.LocaleConfig, langs []str
 			return c.Status(fiber.StatusOK).Type("html").Send(val)
 		}
 
+		lang := ""
 		pathParts := strings.Split(strings.Trim(path, "/"), "/")
-		if len(pathParts) == 0 {
-			return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'")
+		if len(pathParts) == 1 && pathParts[0] == "" {
+			pathParts = []string{}
 		}
-
-		lang := pathParts[0]
-		if !slices.Contains(langs, lang) {
-			return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang))
+		if len(pathParts) > 0 {
+			lang = pathParts[0]
+			for _, availableLang := range langs {
+				if availableLang.Name == lang {
+					goto langIsAvailable
+				}
+			}
+			return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'")
 		}
 
+	langIsAvailable:
 		values := fiber.Map{
 			"L":           l[lang],
 			"Lang":        lang,
+			"Path":        strings.Trim(path, "/"),
 			"QueryString": string(c.Request().URI().QueryString()),
 		}
 		var additionalTemplates []string
@@ -60,6 +67,8 @@ func Api_V1_GeneralPage_TopEmbeds(l map[string]*locale.LocaleConfig, langs []str
 			additionalTemplates = append(additionalTemplates, "views/pages/blog-page.html")
 		} else if len(pathParts) == 1 {
 			additionalTemplates = append(additionalTemplates, "views/pages/home-page.html")
+		} else if len(pathParts) == 0 {
+			additionalTemplates = append(additionalTemplates, "views/pages/language-pick.html")
 		}
 
 		content, err := tm.Render("general-page-top-embeds", values, additionalTemplates...)
diff --git a/internal/router/api-v1-general-page.go b/internal/router/api-v1-general-page.go
index d0ea559..a77fc5e 100644
--- a/internal/router/api-v1-general-page.go
+++ b/internal/router/api-v1-general-page.go
@@ -1,11 +1,10 @@
 package router
 
 import (
-	"fmt"
 	"log/slog"
-	"slices"
 	"strings"
 
+	"github.com/SayaAndy/saya-today-web/config"
 	"github.com/SayaAndy/saya-today-web/locale"
 	"github.com/gofiber/fiber/v2"
 )
@@ -14,21 +13,27 @@ func init() {
 	tm.Add("general-page", "views/layouts/general-page.html")
 }
 
-func Api_V1_GeneralPage(l map[string]*locale.LocaleConfig, langs []string) func(c *fiber.Ctx) error {
+func Api_V1_GeneralPage(l map[string]*locale.LocaleConfig, langs []config.AvailableLanguageConfig) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
 		c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
 		path := c.Path()
 
+		lang := ""
 		pathParts := strings.Split(strings.Trim(path, "/"), "/")
-		if len(pathParts) == 0 {
-			return c.Status(fiber.ErrBadRequest.Code).SendString("url path is invalid: expect format '/{lang}/...'")
+		if len(pathParts) == 1 && pathParts[0] == "" {
+			pathParts = []string{}
 		}
-
-		lang := pathParts[0]
-		if !slices.Contains(langs, lang) {
-			return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang))
+		if len(pathParts) > 0 {
+			lang = pathParts[0]
+			for _, availableLang := range langs {
+				if availableLang.Name == lang {
+					goto langIsAvailable
+				}
+			}
+			return c.Status(fiber.ErrBadRequest.Code).SendString("'Referer' header is invalid: expect format '/{lang}/...'")
 		}
 
+	langIsAvailable:
 		cacheKey := "general-page." + lang
 		if val, ok := PCache.Get(cacheKey); val != nil && ok {
 			c.Set(fiber.HeaderContentType, fiber.MIMETextHTMLCharsetUTF8)
diff --git a/internal/router/lang-blog-title.go b/internal/router/lang-blog-title.go
index d6ca917..6e80671 100644
--- a/internal/router/lang-blog-title.go
+++ b/internal/router/lang-blog-title.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"html/template"
 	"log/slog"
-	"slices"
 	"strconv"
 	"strings"
 
+	"github.com/SayaAndy/saya-today-web/config"
 	"github.com/SayaAndy/saya-today-web/internal/b2"
 	"github.com/SayaAndy/saya-today-web/internal/frontmatter"
 	"github.com/SayaAndy/saya-today-web/locale"
@@ -20,17 +20,20 @@ func init() {
 	tm.Add("blog-page", "views/layouts/general-page.html", "views/pages/blog-page.html")
 }
 
-func Lang_Blog_Title(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client, md goldmark.Markdown) func(c *fiber.Ctx) error {
+func Lang_Blog_Title(l map[string]*locale.LocaleConfig, langs []config.AvailableLanguageConfig, b2Client *b2.B2Client, md goldmark.Markdown) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
 		ip := c.IP()
 		slog.Debug("client entering blog page", slog.String("ip", ip), slog.String("page", c.Path()))
 
 		lang := c.Params("lang")
-		if !slices.Contains(langs, lang) {
-			c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
-			return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang))
+		for _, availableLang := range langs {
+			if availableLang.Name == lang {
+				goto langIsAvailable
+			}
 		}
+		return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language", lang))
 
+	langIsAvailable:
 		metadata, parsedMarkdown, err := readBlogPost(md, b2Client, lang+"/"+c.Params("title"))
 		if err != nil {
 			c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
diff --git a/internal/router/lang-blog.go b/internal/router/lang-blog.go
index 38a6597..960ac3d 100644
--- a/internal/router/lang-blog.go
+++ b/internal/router/lang-blog.go
@@ -8,6 +8,7 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/SayaAndy/saya-today-web/config"
 	"github.com/SayaAndy/saya-today-web/internal/b2"
 	"github.com/SayaAndy/saya-today-web/locale"
 	"github.com/gofiber/fiber/v2"
@@ -17,14 +18,17 @@ func init() {
 	tm.Add("blog-catalogue", "views/layouts/general-page.html", "views/pages/blog-catalogue.html")
 }
 
-func Lang_Blog(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error {
+func Lang_Blog(l map[string]*locale.LocaleConfig, langs []config.AvailableLanguageConfig, b2Client *b2.B2Client) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
 		lang := c.Params("lang")
-		if !slices.Contains(langs, lang) {
-			c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
-			return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang))
+		for _, availableLang := range langs {
+			if availableLang.Name == lang {
+				goto langIsAvailable
+			}
 		}
+		return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language", lang))
 
+	langIsAvailable:
 		querySort := c.Query("sort")
 		if querySort == "" {
 			querySort = "publicationDateDesc"
diff --git a/internal/router/lang-map.go b/internal/router/lang-map.go
index e94d756..a744f02 100644
--- a/internal/router/lang-map.go
+++ b/internal/router/lang-map.go
@@ -3,10 +3,10 @@ package router
 import (
 	"fmt"
 	"log/slog"
-	"slices"
 	"strconv"
 	"strings"
 
+	"github.com/SayaAndy/saya-today-web/config"
 	"github.com/SayaAndy/saya-today-web/internal/b2"
 	"github.com/SayaAndy/saya-today-web/locale"
 	"github.com/gofiber/fiber/v2"
@@ -16,14 +16,17 @@ func init() {
 	tm.Add("global-map", "views/pages/global-map.html")
 }
 
-func Lang_Map(l map[string]*locale.LocaleConfig, langs []string, b2Client *b2.B2Client) func(c *fiber.Ctx) error {
+func Lang_Map(l map[string]*locale.LocaleConfig, langs []config.AvailableLanguageConfig, b2Client *b2.B2Client) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
 		lang := c.Params("lang")
-		if !slices.Contains(langs, lang) {
-			c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
-			return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language... yet??", lang))
+		for _, availableLang := range langs {
+			if availableLang.Name == lang {
+				goto langIsAvailable
+			}
 		}
+		return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language", lang))
 
+	langIsAvailable:
 		pages, err := b2Client.Scan(lang + "/")
 		status := fiber.StatusOK
 		if err != nil {