summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorkolaente <konrad@kola-entertainments.de>2018-05-05 02:28:30 +0200
committerLunny Xiao <xiaolunwen@gmail.com>2018-05-05 08:28:30 +0800
commit1fdf5606785e4a45da7b301b40229a4335a0473c (patch)
treef018a866607c1e84c8ea0f0d62af905ca8cee9a7 /routers
parent795dcc8ecf635aedeec848336c293189d3996605 (diff)
downloadgitea-1fdf5606785e4a45da7b301b40229a4335a0473c.tar.gz
gitea-1fdf5606785e4a45da7b301b40229a4335a0473c.zip
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
Diffstat (limited to 'routers')
-rw-r--r--routers/user/auth.go13
-rw-r--r--routers/user/setting.go7
2 files changed, 19 insertions, 1 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go
index 4249f9e5f9..2a5cb8e4b2 100644
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -339,6 +339,18 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR
ctx.Session.Set("uid", u.ID)
ctx.Session.Set("uname", u.Name)
+ // Language setting of the user overwrites the one previously set
+ // If the user does not have a locale set, we save the current one.
+ if len(u.Language) == 0 {
+ u.Language = ctx.Locale.Language()
+ if err := models.UpdateUserCols(u, "language"); err != nil {
+ log.Error(4, fmt.Sprintf("Error updating user language [user: %d, locale: %s]", u.ID, u.Language))
+ return
+ }
+ }
+
+ ctx.SetCookie("lang", u.Language, nil, setting.AppSubURL)
+
// Clear whatever CSRF has right now, force to generate a new one
ctx.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubURL)
@@ -704,6 +716,7 @@ func SignOut(ctx *context.Context) {
ctx.SetCookie(setting.CookieUserName, "", -1, setting.AppSubURL)
ctx.SetCookie(setting.CookieRememberName, "", -1, setting.AppSubURL)
ctx.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubURL)
+ ctx.SetCookie("lang", "", -1, setting.AppSubURL) // Setting the lang cookie will trigger the middleware to reset the language ot previous state.
ctx.Redirect(setting.AppSubURL + "/")
}
diff --git a/routers/user/setting.go b/routers/user/setting.go
index 2d8b53ff63..f4326bf0f5 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -12,6 +12,7 @@ import (
"strings"
"github.com/Unknwon/com"
+ "github.com/Unknwon/i18n"
"github.com/pquerna/otp"
"github.com/pquerna/otp/totp"
@@ -105,6 +106,7 @@ func SettingsPost(ctx *context.Context, form auth.UpdateProfileForm) {
ctx.User.KeepEmailPrivate = form.KeepEmailPrivate
ctx.User.Website = form.Website
ctx.User.Location = form.Location
+ ctx.User.Language = form.Language
if err := models.UpdateUserSetting(ctx.User); err != nil {
if _, ok := err.(models.ErrEmailAlreadyUsed); ok {
ctx.Flash.Error(ctx.Tr("form.email_been_used"))
@@ -115,8 +117,11 @@ func SettingsPost(ctx *context.Context, form auth.UpdateProfileForm) {
return
}
+ // Update the language to the one we just set
+ ctx.SetCookie("lang", ctx.User.Language, nil, setting.AppSubURL)
+
log.Trace("User settings updated: %s", ctx.User.Name)
- ctx.Flash.Success(ctx.Tr("settings.update_profile_success"))
+ ctx.Flash.Success(i18n.Tr(ctx.User.Language, "settings.update_profile_success"))
ctx.Redirect(setting.AppSubURL + "/user/settings")
}