From 069a99929789c41e57dbdf8dfef27b524f537ed8 Mon Sep 17 00:00:00 2001
From: Thomas Miceli <27960254+thomiceli@users.noreply.github.com>
Date: Tue, 3 Sep 2024 17:15:08 +0200
Subject: [PATCH] Fix package cases crash (#313)

---
 internal/i18n/locale.go |  3 +--
 internal/web/auth.go    | 10 ++++------
 internal/web/util.go    |  4 +++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/internal/i18n/locale.go b/internal/i18n/locale.go
index e4721cd..90e3651 100644
--- a/internal/i18n/locale.go
+++ b/internal/i18n/locale.go
@@ -14,7 +14,6 @@ import (
 	"strings"
 )
 
-var title = cases.Title(language.English)
 var Locales = NewLocaleStore()
 
 type LocaleStore struct {
@@ -59,7 +58,7 @@ func (store *LocaleStore) loadLocaleFromYAML(localeCode, path string) error {
 
 	locale := &Locale{
 		Code:     localeCode,
-		Name:     title.String(name),
+		Name:     cases.Title(language.English).String(name),
 		Messages: make(map[string]string),
 	}
 
diff --git a/internal/web/auth.go b/internal/web/auth.go
index 1b4ff79..9a4f7b2 100644
--- a/internal/web/auth.go
+++ b/internal/web/auth.go
@@ -34,8 +34,6 @@ const (
 	OpenIDConnect  = "openid-connect"
 )
 
-var title = cases.Title(language.English)
-
 func register(ctx echo.Context) error {
 	disableSignup := getData(ctx, "DisableSignup")
 	disableForm := getData(ctx, "DisableLoginForm")
@@ -188,10 +186,10 @@ func oauthCallback(ctx echo.Context) error {
 		updateUserProviderInfo(currUser, user.Provider, user)
 
 		if err = currUser.Update(); err != nil {
-			return errorRes(500, "Cannot update user "+title.String(user.Provider)+" id", err)
+			return errorRes(500, "Cannot update user "+cases.Title(language.English).String(user.Provider)+" id", err)
 		}
 
-		addFlash(ctx, tr(ctx, "flash.auth.account-linked-oauth", title.String(user.Provider)), "success")
+		addFlash(ctx, tr(ctx, "flash.auth.account-linked-oauth", cases.Title(language.English).String(user.Provider)), "success")
 		return redirect(ctx, "/settings")
 	}
 
@@ -358,10 +356,10 @@ func oauth(ctx echo.Context) error {
 		// Means that the user wants to unlink the account
 		if checkFunc, exists := providerIDCheckMap[provider]; exists && checkFunc() {
 			if err := currUser.DeleteProviderID(provider); err != nil {
-				return errorRes(500, "Cannot unlink account from "+title.String(provider), err)
+				return errorRes(500, "Cannot unlink account from "+cases.Title(language.English).String(provider), err)
 			}
 
-			addFlash(ctx, tr(ctx, "flash.auth.account-unlinked-oauth", title.String(provider)), "success")
+			addFlash(ctx, tr(ctx, "flash.auth.account-unlinked-oauth", cases.Title(language.English).String(provider)), "success")
 			return redirect(ctx, "/settings")
 		}
 	}
diff --git a/internal/web/util.go b/internal/web/util.go
index 3935c41..732ed96 100644
--- a/internal/web/util.go
+++ b/internal/web/util.go
@@ -8,6 +8,8 @@ import (
 	"github.com/thomiceli/opengist/internal/config"
 	"github.com/thomiceli/opengist/internal/db"
 	"github.com/thomiceli/opengist/internal/i18n"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 	"html/template"
 	"net/http"
 	"strconv"
@@ -116,7 +118,7 @@ func loadSettings(ctx echo.Context) error {
 
 	for key, value := range settings {
 		s := strings.ReplaceAll(key, "-", " ")
-		s = title.String(s)
+		s = cases.Title(language.English).String(s)
 		setData(ctx, strings.ReplaceAll(s, " ", ""), value == "1")
 	}
 	return nil