1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00

Added user language setting (#3875)

* Added user language setting

* Added translation string for setting

* Fixed import order + typo

* improved checking if the user has a language saved in the db

* The current saved language is now set a default inside the dropdown

* fmt

* When a user signs in and doesn't have a language saved, the current browser language is saved

* updated gitea-sdk

* Merge branch 'master' of https://github.com/go-gitea/gitea into save-user-language

# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v62.go

* Made tests work again

* trigger CI

* trigger CI

* fmt

* re-trigger that FUCKING CI SO IT REALLY PICKS UP THE LATEST COMMIT ISTEAD OF PREDENDING TO DO SO

* re-trigger that FUCKING CI SO IT REALLY PICKS UP THE LATEST COMMIT ISTEAD OF PREDENDING TO DO SO

* When loggin in, only the language col gets updated instead of everything
This commit is contained in:
kolaente
2018-05-05 02:28:30 +02:00
committed by Lunny Xiao
parent 795dcc8ecf
commit 1fdf560678
13 changed files with 81 additions and 10 deletions

View File

@@ -22,6 +22,8 @@ type User struct {
Email string `json:"email"`
// URL to the user's avatar
AvatarURL string `json:"avatar_url"`
// User locale
Language string `json:"language"`
}
// MarshalJSON implements the json.Marshaler interface for User, adding field(s) for backward compatibility

6
vendor/vendor.json vendored
View File

@@ -9,10 +9,10 @@
"revisionTime": "2018-04-21T01:08:19Z"
},
{
"checksumSHA1": "xXzi8Xx7HA3M0z3lR/1wr1Vz1fc=",
"checksumSHA1": "WMD6+Qh2+5hd9uiq910pF/Ihylw=",
"path": "code.gitea.io/sdk/gitea",
"revision": "142acef5ce79f78585afcce31748af46c72a3dea",
"revisionTime": "2018-04-17T00:54:29Z"
"revision": "1c8d12f79a51605ed91587aa6b86cf38fc0f987f",
"revisionTime": "2018-05-01T11:15:19Z"
},
{
"checksumSHA1": "bOODD4Gbw3GfcuQPU2dI40crxxk=",