i8n, language select dropdown, ai built localizations into ES / DE / FR

dwot · Jan 3, 2025 · 2f5cc32 · 2f5cc32
1 parent 22a0d18
commit 2f5cc32
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 11 deletions.
diff --git a/main.go b/main.go
@@ -165,7 +165,7 @@ func main() {
 
 	// Public routes
 	r.GET("/login", func(c *gin.Context) {
-		lang := c.DefaultQuery("lang", "en")
+		lang := utils.GetLanguage(c)
 		translations := utils.TranslationService.GetTranslations(lang)
 		c.HTML(http.StatusOK, "views/login.html", gin.H{
 			"lcl":             translations,
@@ -208,7 +208,7 @@ func main() {
 		protected.Use(ForcePasswordChangeMiddleware())
 
 		protected.GET("/change-password", func(c *gin.Context) {
-			lang := c.DefaultQuery("lang", "en")
+			lang := utils.GetLanguage(c)
 			translations := utils.TranslationService.GetTranslations(lang)
 			c.HTML(http.StatusOK, "views/change-password.html", gin.H{
 				"lcl":             translations,

diff --git a/routes/routes.go b/routes/routes.go
@@ -11,7 +11,7 @@ import (
 
 func AddBasicRoutes(r *gin.RouterGroup, version string) {
 	r.GET("/", func(c *gin.Context) {
-		lang := c.DefaultQuery("lang", "en")
+		lang := utils.GetLanguage(c)
 		translations := utils.TranslationService.GetTranslations(lang)
 		c.HTML(http.StatusOK, "views/index.html", gin.H{
 			"title":           "Dashboard",
@@ -26,7 +26,7 @@ func AddBasicRoutes(r *gin.RouterGroup, version string) {
 	})
 
 	r.GET("/plants", func(c *gin.Context) {
-		lang := c.DefaultQuery("lang", "en")
+		lang := utils.GetLanguage(c)
 		translations := utils.TranslationService.GetTranslations(lang)
 		c.HTML(http.StatusOK, "views/plants.html", gin.H{
 			"title":           "Plants",
@@ -45,7 +45,7 @@ func AddBasicRoutes(r *gin.RouterGroup, version string) {
 	})
 
 	r.GET("/strains", func(c *gin.Context) {
-		lang := c.DefaultQuery("lang", "en")
+		lang := utils.GetLanguage(c)
 		translations := utils.TranslationService.GetTranslations(lang)
 		c.HTML(http.StatusOK, "views/strains.html", gin.H{
 			"title":           "Strains",
@@ -62,7 +62,7 @@ func AddBasicRoutes(r *gin.RouterGroup, version string) {
 	})
 
 	r.GET("/graph/:id", func(c *gin.Context) {
-		lang := c.DefaultQuery("lang", "en")
+		lang := utils.GetLanguage(c)
 		translations := utils.TranslationService.GetTranslations(lang)
 		c.HTML(http.StatusOK, "views/graph.html", gin.H{
 			"title":           "Sensor Graphs",
@@ -78,7 +78,7 @@ func AddBasicRoutes(r *gin.RouterGroup, version string) {
 	})
 
 	r.GET("/plant/:id", func(c *gin.Context) {
-		lang := c.DefaultQuery("lang", "en")
+		lang := utils.GetLanguage(c)
 		translations := utils.TranslationService.GetTranslations(lang)
 		c.HTML(http.StatusOK, "views/plant.html", gin.H{
 			"title":           "Plant Details",
@@ -166,7 +166,7 @@ func AddProtectedApiRoutes(r *gin.RouterGroup) {
 
 func AddProtectedRotues(r *gin.RouterGroup, version string) {
 	r.GET("/settings", func(c *gin.Context) {
-		lang := c.DefaultQuery("lang", "en")
+		lang := utils.GetLanguage(c)
 		translations := utils.TranslationService.GetTranslations(lang)
 		c.HTML(http.StatusOK, "views/settings.html", gin.H{
 			"title":           "Settings",
@@ -185,7 +185,7 @@ func AddProtectedRotues(r *gin.RouterGroup, version string) {
 	})
 
 	r.GET("/sensors", func(c *gin.Context) {
-		lang := c.DefaultQuery("lang", "en")
+		lang := utils.GetLanguage(c)
 		translations := utils.TranslationService.GetTranslations(lang)
 		c.HTML(http.StatusOK, "views/sensors.html", gin.H{
 			"title":           "Sensors",

diff --git a/utils/i18n.go b/utils/i18n.go
@@ -2,6 +2,8 @@ package utils
 
 import (
 	"embed"
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-gonic/gin"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"golang.org/x/text/language"
 	"gopkg.in/yaml.v3"
@@ -350,3 +352,18 @@ func (i *I18nManager) GetTranslations(lang string) map[string]string {
 	}
 	return translations
 }
+
+func GetLanguage(c *gin.Context) string {
+	lang := "en"
+	queryLang := c.Query("lang")
+	sessionLang := sessions.Default(c).Get("lang")
+	if sessionLang != nil {
+		lang = sessionLang.(string)
+	}
+	if queryLang != "" {
+		lang = queryLang
+		sessions.Default(c).Set("lang", lang)
+		sessions.Default(c).Save()
+	}
+	return lang
+}
diff --git a/web/templates/pages/strains.html b/web/templates/pages/strains.html
@@ -429,8 +429,8 @@ <h5 class="modal-title" id="editStrainModalLabel">{{ .lcl.edit_strain }}</h5>
             <thead class="table-dark">
                 <tr>
                     <th scope="col" data-key="name" data-type="text" class="sortable ${currentSort.key === "name" ? (currentSort.isAscending ? "asc" : "desc") : ""}">{{ .lcl.title_strain }} <i class="fa-solid fa-sort"></i></th>
-                    <th scope="col" data-key="breeder" data-type="text" class="sortable ${currentSort.key === "breeder" ? (currentSort.isAscending ? "asc" : "desc") : ""}">{{ .lcl.title_breeder }} <i class="fa-solid fa-sort"></i></th>
-                    <th scope="col" data-key="indica" data-type="numeric" class="sortable ${currentSort.key === "indica" ? (currentSort.isAscending ? "asc" : "desc") : ""}">{{ .lcl.title_i_s }} <i class="fa-solid fa-sort"></i></th>
+                    <th scope="col" data-key="breeder" data-type="text" class="sortable ${currentSort.key === "breeder" ? (currentSort.isAscending ? "asc" : "desc") : ""}">{{ .lcl.breeder }} <i class="fa-solid fa-sort"></i></th>
+                    <th scope="col" data-key="indica" data-type="numeric" class="sortable ${currentSort.key === "indica" ? (currentSort.isAscending ? "asc" : "desc") : ""}">{{ .lcl.title_is }} <i class="fa-solid fa-sort"></i></th>
                     <th scope="col" data-key="autoflower" data-type="text" class="sortable ${currentSort.key === "autoflower" ? (currentSort.isAscending ? "asc" : "desc") : ""}">{{ .lcl.title_auto }} <i class="fa-solid fa-sort"></i></th>
                     <th scope="col" data-key="seed_count" data-type="numeric" class="sortable ${currentSort.key === "seed_count" ? (currentSort.isAscending ? "asc" : "desc") : ""}">{{ .lcl.seed_count }} <i class="fa-solid fa-sort"></i></th>
                     <th scope="col">Edit </th>