Implement switching language (but doesn't persist)

This commit is contained in:
Alf Sebastian Houge
2023-07-18 22:48:36 +02:00
parent 14968013dd
commit 302bdd2222
6 changed files with 34 additions and 16 deletions

View File

@@ -19,7 +19,7 @@ func RegisterAnonMasterConroller(router *gin.RouterGroup) {
"distanceUnits": db.DistanceUnitDetails,
"roles": db.RoleDetails,
"currencies": models.GetCurrencyMasterList(),
"languages": models.GetLanguageMastersList(),
"languages": models.GetLanguageMastersList(),
})
})
}
@@ -53,7 +53,7 @@ func udpateSettings(c *gin.Context) {
func udpateMySettings(c *gin.Context) {
var model models.UpdateSettingModel
if err := c.ShouldBind(&model); err == nil {
err := service.UpdateUserSettings(c.MustGet("userId").(string), model.Currency, *model.DistanceUnit, model.DateFormat)
err := service.UpdateUserSettings(c.MustGet("userId").(string), model.Currency, *model.DistanceUnit, model.DateFormat, model.Language)
if err != nil {
c.JSON(http.StatusUnprocessableEntity, common.NewError("udpateMySettings", err))
return

View File

@@ -29,7 +29,7 @@ var migrations = []localMigration{
},
{
Name: "2023_02_26_13_42_AddLanguage",
Query: "ALTER TABLE users ADD COLUMN language text default 'English 🇬🇧'",
Query: "ALTER TABLE users ADD COLUMN language text default 'en'",
},
}

View File

@@ -4,6 +4,7 @@ type LanguageModel struct {
Emoji string `json:"emoji"`
Name string `json:"name"`
NameNative string `json:"nameNative"`
Shorthand string `json:"shorthand"`
}
func GetLanguageMastersList() []LanguageModel {
@@ -12,10 +13,12 @@ func GetLanguageMastersList() []LanguageModel {
Emoji: "🇬🇧",
Name: "English",
NameNative: "English",
Shorthand: "en",
}, {
Emoji: "🇩🇪",
Name: "German",
NameNative: "Deutsch",
Shorthand: "de",
},
}
}

View File

@@ -6,6 +6,7 @@ type UpdateSettingModel struct {
Currency string `json:"currency" form:"currency" query:"currency"`
DateFormat string `json:"dateFormat" form:"dateFormat" query:"dateFormat"`
DistanceUnit *db.DistanceUnit `json:"distanceUnit" form:"distanceUnit" query:"distanceUnit" `
Language string `json:"language" form:"language" query:"language"`
}
type ClarksonMigrationModel struct {

View File

@@ -1,7 +1,9 @@
package service
import (
"errors"
"hammond/db"
"hammond/models"
)
func CanInitializeSystem() (bool, error) {
@@ -14,15 +16,30 @@ func UpdateSettings(currency string, distanceUnit db.DistanceUnit) error {
setting.DistanceUnit = distanceUnit
return db.UpdateSettings(setting)
}
func UpdateUserSettings(userId, currency string, distanceUnit db.DistanceUnit, dateFormat string) error {
func UpdateUserSettings(userId, currency string, distanceUnit db.DistanceUnit, dateFormat string, language string) error {
user, err := db.GetUserById(userId)
if err != nil {
return err
}
// TODO: Pull into function
languageExists := false
languages := models.GetLanguageMastersList();
for _, lang := range languages {
if (language == lang.Shorthand){
languageExists = true
}
}
if (!languageExists) {
return errors.New("Language not in masters list")
}
user.Currency = currency
user.DistanceUnit = distanceUnit
user.DateFormat = dateFormat
user.Language = language
return db.UpdateUser(user)
}