update
This commit is contained in:
parent
52bee24164
commit
2ef54d14f9
@ -3,8 +3,8 @@ package handlers
|
|||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
|
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
|
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/user"
|
"git.tijl.dev/tijl/tijl.dev-core/internal/user"
|
||||||
|
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
)
|
)
|
||||||
|
@ -3,9 +3,9 @@ package handlers
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
|
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
|
"git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/user"
|
"git.tijl.dev/tijl/tijl.dev-core/internal/user"
|
||||||
|
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
)
|
)
|
||||||
|
@ -10,7 +10,7 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
|
||||||
log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
|
log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
|
@ -5,9 +5,8 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/config"
|
"git.tijl.dev/tijl/tijl.dev-core/internal/config"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
|
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
|
"git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/user"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
||||||
webf "git.tijl.dev/tijl/tijl.dev-core/web"
|
webf "git.tijl.dev/tijl/tijl.dev-core/web"
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
@ -39,10 +38,10 @@ func routes(app *fiber.App) {
|
|||||||
return c.Render("about", data, "layouts/base")
|
return c.Render("about", data, "layouts/base")
|
||||||
})
|
})
|
||||||
app.Get("/services", func(c *fiber.Ctx) error {
|
app.Get("/services", func(c *fiber.Ctx) error {
|
||||||
_, err := user.GetSession(c)
|
/*_, err := user.GetSession(c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return c.Next()
|
return c.Next()
|
||||||
}
|
}*/
|
||||||
data := *web.Common(c)
|
data := *web.Common(c)
|
||||||
data["Title"] = i18n.Translate(c, "services")
|
data["Title"] = i18n.Translate(c, "services")
|
||||||
return c.Render("services", data, "layouts/base")
|
return c.Render("services", data, "layouts/base")
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
package handlers
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
)
|
)
|
||||||
|
@ -8,10 +8,11 @@ import (
|
|||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/assets"
|
"git.tijl.dev/tijl/tijl.dev-core/internal/assets"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/config"
|
"git.tijl.dev/tijl/tijl.dev-core/internal/config"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/handlers"
|
"git.tijl.dev/tijl/tijl.dev-core/internal/handlers"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
|
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
|
"git.tijl.dev/tijl/tijl.dev-core/internal/oidc"
|
||||||
webinternal "git.tijl.dev/tijl/tijl.dev-core/internal/web"
|
webinternal "git.tijl.dev/tijl/tijl.dev-core/internal/web"
|
||||||
|
"git.tijl.dev/tijl/tijl.dev-core/locales"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/modules/db"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/db"
|
||||||
|
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/modules/logger"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/logger"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
||||||
webf "git.tijl.dev/tijl/tijl.dev-core/web"
|
webf "git.tijl.dev/tijl/tijl.dev-core/web"
|
||||||
@ -35,7 +36,7 @@ func Listen() {
|
|||||||
// Load assets
|
// Load assets
|
||||||
assets.Load()
|
assets.Load()
|
||||||
// Load translations
|
// Load translations
|
||||||
i18n.Load()
|
i18n.RegisterTranslations(locales.Embed, ".")
|
||||||
// setup handler
|
// setup handler
|
||||||
handlers.Setup()
|
handlers.Setup()
|
||||||
// setup web
|
// setup web
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
package web
|
package web
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/i18n"
|
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/internal/user"
|
"git.tijl.dev/tijl/tijl.dev-core/internal/user"
|
||||||
|
"git.tijl.dev/tijl/tijl.dev-core/modules/i18n"
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
"git.tijl.dev/tijl/tijl.dev-core/modules/web"
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
)
|
)
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
package i18n
|
package i18n
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"embed"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.tijl.dev/tijl/tijl.dev-core/locales"
|
|
||||||
log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
|
log "git.tijl.dev/tijl/tijl.dev-core/modules/logger"
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
)
|
)
|
||||||
@ -14,10 +14,13 @@ var translations map[string]map[string]string
|
|||||||
|
|
||||||
const DefaultLang = "en"
|
const DefaultLang = "en"
|
||||||
|
|
||||||
func Load() {
|
func RegisterTranslations(embed embed.FS, location string) {
|
||||||
translations = make(map[string]map[string]string)
|
if translations == nil {
|
||||||
|
translations = make(map[string]map[string]string)
|
||||||
|
}
|
||||||
|
|
||||||
|
files, err := embed.ReadDir(location)
|
||||||
|
|
||||||
files, err := locales.Embed.ReadDir(".")
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal().Err(err)
|
log.Fatal().Err(err)
|
||||||
}
|
}
|
||||||
@ -33,7 +36,7 @@ func Load() {
|
|||||||
|
|
||||||
lang := strings.TrimSuffix(file.Name(), filepath.Ext(file.Name()))
|
lang := strings.TrimSuffix(file.Name(), filepath.Ext(file.Name()))
|
||||||
|
|
||||||
data, err := locales.Embed.ReadFile(filepath.Join(".", file.Name()))
|
data, err := embed.ReadFile(filepath.Join(location, file.Name()))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error().Err(err).Msg("Failed to read file")
|
log.Error().Err(err).Msg("Failed to read file")
|
||||||
continue
|
continue
|
||||||
@ -45,11 +48,16 @@ func Load() {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Debug().Str("filename", file.Name()).Msg("i18n.Load: loaded")
|
if translations[lang] == nil {
|
||||||
translations[lang] = messages
|
translations[lang] = make(map[string]string)
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Info().Msg("loaded translations")
|
for key, value := range messages {
|
||||||
|
translations[lang][key] = value
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Debug().Str("filename", file.Name()).Msg("i18n.RegisterTranslations: loaded")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func Translate(c *fiber.Ctx, key string) string {
|
func Translate(c *fiber.Ctx, key string) string {
|
@ -1,6 +1,6 @@
|
|||||||
/** @type {import('tailwindcss').Config} */
|
/** @type {import('tailwindcss').Config} */
|
||||||
module.exports = {
|
module.exports = {
|
||||||
content: ["./web/views/**/*.html", "./web/**/*.{js,ts,css}"],
|
content: ["./internal/**/*.html", "./web/views/**/*.html", "./web/**/*.{js,ts,css}"],
|
||||||
theme: {
|
theme: {
|
||||||
extend: {},
|
extend: {},
|
||||||
},
|
},
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<nav hx-boost="true" class="flex fixed mx-auto w-full md:w-[80%] lg:w-[75%]">
|
<nav hx-boost="true" class="flex fixed mx-auto w-full md:w-[80%] lg:w-[75%]">
|
||||||
<div class="mt-4 mx-4 rounded-2xl shadow-2xl bg-base-300 navbar">
|
<div class="mt-4 mx-4 rounded-2xl shadow-xl bg-base-300 navbar">
|
||||||
<div class="flex-1">
|
<div class="flex-1">
|
||||||
<a href="/" class="btn btn-ghost font-mono text-xl">tijl.dev</a>
|
<a href="/" class="btn btn-ghost font-mono text-xl">tijl.dev</a>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user