From 8a6652587baa0bce6d2a56e6163b670fb7ae7b0a Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 30 Nov 2019 14:01:26 +0100 Subject: [PATCH 1/2] add language to user api --- modules/convert/convert.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/convert/convert.go b/modules/convert/convert.go index 0fa05d08508a..311831e624ec 100644 --- a/modules/convert/convert.go +++ b/modules/convert/convert.go @@ -257,7 +257,7 @@ func ToTeam(team *models.Team) *api.Team { // ToUser convert models.User to api.User // signed shall only be set if requester is logged in. authed shall only be set if user is site admin or user himself -func ToUser(user *models.User, signed, authed bool) *api.User { +func ToUser(user *models.User, signed bool, authed bool) *api.User { result := &api.User{ UserName: user.Name, AvatarURL: user.AvatarLink(), @@ -273,6 +273,7 @@ func ToUser(user *models.User, signed, authed bool) *api.User { result.ID = user.ID result.IsAdmin = user.IsAdmin result.LastLogin = user.LastLoginUnix.AsTime() + result.Language = user.Language } return result } From 6c40c45795c8eedfcb3f01f049e579d0d798a1c0 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 30 Nov 2019 16:05:21 +0100 Subject: [PATCH 2/2] OK Co-Authored-By: Lauris BH --- modules/convert/convert.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/convert/convert.go b/modules/convert/convert.go index 311831e624ec..4479653174ca 100644 --- a/modules/convert/convert.go +++ b/modules/convert/convert.go @@ -257,7 +257,7 @@ func ToTeam(team *models.Team) *api.Team { // ToUser convert models.User to api.User // signed shall only be set if requester is logged in. authed shall only be set if user is site admin or user himself -func ToUser(user *models.User, signed bool, authed bool) *api.User { +func ToUser(user *models.User, signed, authed bool) *api.User { result := &api.User{ UserName: user.Name, AvatarURL: user.AvatarLink(),