Added user language setting #3875

kolaente · 2018-05-01T10:57:57Z

This pr adds the possibility for users to set their language in the profile settings. When logging in, this setting overwrites the current language setting.

This feature is needed to send translatable emails in the future.

~~Blocked by go-gitea/go-sdk#104~~

jonasfranz · 2018-05-01T11:02:22Z

routers/user/setting.go

@@ -25,6 +25,7 @@ import (
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
+	"github.com/Unknwon/i18n"


Fix import order

jonasfranz · 2018-05-01T11:03:02Z

models/migrations/v62.go

+
+import (
+	"fmt"
+	"github.com/go-xorm/xorm"


Fix import order

jonasfranz · 2018-05-01T11:03:56Z

models/migrations/migrations.go

@@ -176,6 +176,8 @@ var migrations = []Migration{
 	NewMigration("add is_fsck_enabled column for repos", addFsckEnabledToRepo),
 	// v61 -> v62
 	NewMigration("add size column for attachments", addSizeToAttachment),
+	// v62 -> v63
+	NewMigration("add language comumn for user setting", addLanguageSetting),


jonasfranz · 2018-05-01T11:07:13Z

templates/user/settings/profile.tmpl

+							<div class="text">{{.LangName}}</div>
+							<div class="menu">
+							{{range .AllLangs}}
+								<div class="item{{if eq $.Lang .Lang}} active selected{{end}}" data-value="{{.Lang}}">{{.Name}}</div>


You should check if .Lang is equal with user's language in database and not with the current language.
If I set german as my language but change it manually by selecting another language (example: english) from the dropdown in the footer, the selected language in the form will be english. The expected selected language should be german.

Fixed that.

lafriks · 2018-05-01T11:14:22Z

routers/user/auth.go

@@ -333,6 +333,11 @@ 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 u.Language != "" {


len(u.Language) != 0

jonasfranz · 2018-05-01T11:14:57Z

models/migrations/v62.go

+		Language string `xorm:"VARCHAR(5)"`
+	}
+
+	if err := x.Sync2(new(User)); err != nil {


Is it possible that if a user logs in after an upgrade of the database, the language he/she is currently using is set as language in database? Do you think that the default language should be en_US (at database migration)?

I think empty can be left as default after migration but when first logging in if it is empty it could be set to current ui language

I haven't thought of that, I'll implement it.

jonasfranz · 2018-05-01T11:16:10Z

@kolaente Please update go-sdk in order to fix the drone build.

kolaente · 2018-05-01T11:41:16Z

@JonasFranzDEV done.

…rowser language is saved

kolaente · 2018-05-01T11:57:00Z

Does someone know why drone doesn't picks up the right commit?

jonasfranz · 2018-05-01T11:57:42Z

LGTM

kolaente · 2018-05-01T12:01:51Z

Drone fail seems unrelated, the tests work on my machine.

…user-language # Conflicts: # vendor/vendor.json

…user-language # Conflicts: # models/migrations/migrations.go # models/migrations/v62.go

…TEAD OF PREDENDING TO DO SO

…into save-user-language

codecov-io · 2018-05-03T13:34:40Z

Codecov Report

Merging #3875 into master will increase coverage by <.01%.
The diff coverage is 6.25%.

@@            Coverage Diff             @@
##           master    #3875      +/-   ##
==========================================
+ Coverage   20.16%   20.17%   +<.01%     
==========================================
  Files         145      145              
  Lines       29156    29171      +15     
==========================================
+ Hits         5880     5884       +4     
- Misses      22381    22393      +12     
+ Partials      895      894       -1

Impacted Files	Coverage Δ
routers/user/setting.go	`2.75% <0%> (-0.02%)`	⬇️
routers/user/auth.go	`0% <0%> (ø)`	⬆️
models/user.go	`23.58% <100%> (+0.08%)`	⬆️
modules/process/manager.go	`73.91% <0%> (+4.34%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 795dcc8...5660ff0. Read the comment docs.

lunny · 2018-05-04T01:20:14Z

routers/user/auth.go

+	// 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.UpdateUser(u); err != nil {


You should only update language column but not all the columns.

Fixed that.

lafriks · 2018-05-04T16:54:33Z

@lunny need your approval

* SECURITY * Limit uploaded avatar image-size to 4096x3072 by default (go-gitea#4353) * Do not allow to reuse TOTP passcode (go-gitea#3878) * FEATURE * Add cli commands to regen hooks & keys (go-gitea#3979) * Add support for FIDO U2F (go-gitea#3971) * Added user language setting (go-gitea#3875) * LDAP Public SSH Keys synchronization (go-gitea#1844) * Add topic support (go-gitea#3711) * Multiple assignees (go-gitea#3705) * Add protected branch whitelists for merging (go-gitea#3689) * Global code search support (go-gitea#3664) * Add label descriptions (go-gitea#3662) * Add issue search via API (go-gitea#3612) * Add repository setting to enable/disable health checks (go-gitea#3607) * Emoji Autocomplete (go-gitea#3433) * Implements generator cli for secrets (go-gitea#3531) * ENHANCEMENT * Add more webhooks support and refactor webhook templates directory (go-gitea#3929) * Add new option to allow only OAuth2/OpenID user registration (go-gitea#3910) * Add option to use paged LDAP search when synchronizing users (go-gitea#3895) * Symlink icons (go-gitea#1416) * Improve release page UI (go-gitea#3693) * Add admin dashboard option to run health checks (go-gitea#3606) * Add branch link in branch list (go-gitea#3576) * Reduce sql query times in retrieveFeeds (go-gitea#3547) * Option to enable or disable swagger endpoints (go-gitea#3502) * Add missing licenses (go-gitea#3497) * Reduce repo indexer disk usage (go-gitea#3452) * Enable caching on assets and avatars (go-gitea#3376) * Add repository search ordered by stars/forks. Forks column in admin repo list (go-gitea#3969) * Add Environment Variables to Docker template (go-gitea#4012) * LFS: make HTTP auth period configurable (go-gitea#4035) * Add config path as an optionial flag when changing pass via CLI (go-gitea#4184) * Refactor User Settings sections (go-gitea#3900) * Allow square brackets in external issue patterns (go-gitea#3408) * Add Attachment API (go-gitea#3478) * Add EnableTimetracking option to app settings (go-gitea#3719) * Add config option to enable or disable log executed SQL (go-gitea#3726) * Shows total tracked time in issue and milestone list (go-gitea#3341) * TRANSLATION * Improve English grammar and consistency (go-gitea#3614) * DEPLOYMENT * Allow Gitea to run as different USER in Docker (go-gitea#3961) * Provide compressed release binaries (go-gitea#3991) * Sign release binaries (go-gitea#4188)

kolaente added 2 commits May 1, 2018 12:54

Added user language setting

6bd5c33

Added translation string for setting

2f1934b

jonasfranz suggested changes May 1, 2018

View reviewed changes

bkcsoft added lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 1, 2018

lafriks reviewed May 1, 2018

View reviewed changes

jonasfranz reviewed May 1, 2018

View reviewed changes

kolaente added 2 commits May 1, 2018 13:28

Fixed import order + typo

064eb06

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

5f7f2cc

lafriks added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label May 1, 2018

lafriks added this to the 1.5.0 milestone May 1, 2018

lafriks added the type/changelog Adds the changelog for a new Gitea version label May 1, 2018

kolaente added 2 commits May 1, 2018 13:40

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

047f488

fmt

d06e37f

kolaente added 2 commits May 1, 2018 13:50

When a user signs in and doesn't have a language saved, the current b…

5ed980d

…rowser language is saved

updated gitea-sdk

0d51925

bkcsoft added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 1, 2018

jonasfranz approved these changes May 1, 2018

View reviewed changes

kolaente added 6 commits May 1, 2018 21:56

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

d72c183

…user-language # Conflicts: # vendor/vendor.json

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

08ef144

…user-language # Conflicts: # models/migrations/migrations.go # models/migrations/v62.go

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

6b90197

…user-language # Conflicts: # models/migrations/migrations.go # models/migrations/v62.go

Made tests work again

dfe96f1

trigger CI

0a25402

trigger CI

0b72ded

kolaente added 4 commits May 3, 2018 15:17

fmt

818fac3

re-trigger that FUCKING CI SO IT REALLY PICKS UP THE LATEST COMMIT IS…

425af39

…TEAD OF PREDENDING TO DO SO

re-trigger that FUCKING CI SO IT REALLY PICKS UP THE LATEST COMMIT IS…

1f02048

…TEAD OF PREDENDING TO DO SO

Merge branch 'save-user-language' of https://github.com/kolaente/gitea …

45213db

…into save-user-language

lafriks approved these changes May 3, 2018

View reviewed changes

bkcsoft added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 3, 2018

lunny requested changes May 4, 2018

View reviewed changes

kolaente and others added 2 commits May 4, 2018 16:25

When loggin in, only the language col gets updated instead of everything

cf65e37

Merge branch 'master' into save-user-language

5660ff0

lunny approved these changes May 5, 2018

View reviewed changes

lunny merged commit 1fdf560 into go-gitea:master May 5, 2018

kolaente deleted the save-user-language branch July 15, 2018 18:33

kolaente mentioned this pull request Oct 18, 2018

Improvements in email notifications on issues and pull requests #5083

Closed

go-gitea locked and limited conversation to collaborators Nov 24, 2020

delvh removed the type/changelog Adds the changelog for a new Gitea version label Oct 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added user language setting #3875

Added user language setting #3875

kolaente commented May 1, 2018 •

edited

Loading

jonasfranz May 1, 2018

kolaente May 1, 2018

jonasfranz May 1, 2018

jonasfranz May 1, 2018

jonasfranz May 1, 2018

kolaente May 1, 2018

lafriks May 1, 2018

kolaente May 1, 2018

jonasfranz May 1, 2018

lafriks May 1, 2018

kolaente May 1, 2018

kolaente May 1, 2018

jonasfranz commented May 1, 2018

kolaente commented May 1, 2018

kolaente commented May 1, 2018

jonasfranz commented May 1, 2018

kolaente commented May 1, 2018

codecov-io commented May 3, 2018 •

edited

Loading

lunny May 4, 2018

kolaente May 4, 2018

lafriks commented May 4, 2018

Added user language setting #3875

Added user language setting #3875

Conversation

kolaente commented May 1, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonasfranz commented May 1, 2018

kolaente commented May 1, 2018

kolaente commented May 1, 2018

jonasfranz commented May 1, 2018

kolaente commented May 1, 2018

codecov-io commented May 3, 2018 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lafriks commented May 4, 2018

kolaente commented May 1, 2018 •

edited

Loading

codecov-io commented May 3, 2018 •

edited

Loading