feat: save user language in the settings
continuous-integration/drone/push Build is failing Details

This commit is contained in:
kolaente 2021-12-12 15:39:47 +01:00
parent 8bb3f8d37c
commit a98119f2d6
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
7 changed files with 66 additions and 6 deletions

View File

@ -0,0 +1,43 @@
// Vikunja is a to-do list application to facilitate your life.
// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public Licensee as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public Licensee for more details.
//
// You should have received a copy of the GNU Affero General Public Licensee
// along with this program. If not, see <https://www.gnu.org/licenses/>.
package migration
import (
"src.techknowlogick.com/xormigrate"
"xorm.io/xorm"
)
type user20211212151642 struct {
Language string `xorm:"varchar(50) null" json:"-"`
}
func (user20211212151642) TableName() string {
return "users"
}
func init() {
migrations = append(migrations, &xormigrate.Migration{
ID: "20211212151642",
Description: "Add user langauge field",
Migrate: func(tx *xorm.Engine) error {
return tx.Sync2(user20211212151642{})
},
Rollback: func(tx *xorm.Engine) error {
return nil
},
})
}

View File

@ -50,6 +50,8 @@ type UserSettings struct {
DefaultListID int64 `json:"default_list_id"`
// The day when the week starts for this user. 0 = sunday, 1 = monday, etc.
WeekStart int `json:"week_start"`
// The user's language
Language string `json:"language"`
}
// GetUserAvatarProvider returns the currently set user avatar
@ -177,6 +179,7 @@ func UpdateGeneralUserSettings(c echo.Context) error {
user.OverdueTasksRemindersEnabled = us.OverdueTasksRemindersEnabled
user.DefaultListID = us.DefaultListID
user.WeekStart = us.WeekStart
user.Language = us.Language
_, err = user2.UpdateUser(s, user)
if err != nil {

View File

@ -73,6 +73,7 @@ func UserShow(c echo.Context) error {
OverdueTasksRemindersEnabled: u.OverdueTasksRemindersEnabled,
DefaultListID: u.DefaultListID,
WeekStart: u.WeekStart,
Language: u.Language,
},
DeletionScheduledAt: u.DeletionScheduledAt,
IsLocalUser: u.Issuer == user.IssuerLocal,

View File

@ -8966,6 +8966,10 @@ var doc = `{
"description": "If enabled, sends email reminders of tasks to the user.",
"type": "boolean"
},
"language": {
"description": "The user's language",
"type": "string"
},
"name": {
"description": "The new name of the current user.",
"type": "string"

View File

@ -8950,6 +8950,10 @@
"description": "If enabled, sends email reminders of tasks to the user.",
"type": "boolean"
},
"language": {
"description": "The user's language",
"type": "string"
},
"name": {
"description": "The new name of the current user.",
"type": "string"

View File

@ -1274,6 +1274,9 @@ definitions:
email_reminders_enabled:
description: If enabled, sends email reminders of tasks to the user.
type: boolean
language:
description: The user's language
type: string
name:
description: The new name of the current user.
type: string

View File

@ -88,12 +88,13 @@ type User struct {
Issuer string `xorm:"text null" json:"-"`
Subject string `xorm:"text null" json:"-"`
EmailRemindersEnabled bool `xorm:"bool default true" json:"-"`
DiscoverableByName bool `xorm:"bool default false index" json:"-"`
DiscoverableByEmail bool `xorm:"bool default false index" json:"-"`
OverdueTasksRemindersEnabled bool `xorm:"bool default true index" json:"-"`
DefaultListID int64 `xorm:"bigint null index" json:"-"`
WeekStart int `xorm:"null" json:"-"`
EmailRemindersEnabled bool `xorm:"bool default true" json:"-"`
DiscoverableByName bool `xorm:"bool default false index" json:"-"`
DiscoverableByEmail bool `xorm:"bool default false index" json:"-"`
OverdueTasksRemindersEnabled bool `xorm:"bool default true index" json:"-"`
DefaultListID int64 `xorm:"bigint null index" json:"-"`
WeekStart int `xorm:"null" json:"-"`
Language string `xorm:"varchar(50) null" json:"-"`
DeletionScheduledAt time.Time `xorm:"datetime null" json:"-"`
DeletionLastReminderSent time.Time `xorm:"datetime null" json:"-"`
@ -477,6 +478,7 @@ func UpdateUser(s *xorm.Session, user *User) (updatedUser *User, err error) {
"overdue_tasks_reminders_enabled",
"default_list_id",
"week_start",
"language",
).
Update(user)
if err != nil {