diff --git a/models/user/user.go b/models/user/user.go index c362cbc6d2b55..2ab07bf7993eb 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -98,6 +98,7 @@ type User struct { Type UserType Location string Website string + Pronouns string Rands string `xorm:"VARCHAR(32)"` Salt string `xorm:"VARCHAR(32)"` Language string `xorm:"VARCHAR(5)"` diff --git a/modules/structs/admin_user.go b/modules/structs/admin_user.go index c68b59a8978ee..6bb99cfa0eb68 100644 --- a/modules/structs/admin_user.go +++ b/modules/structs/admin_user.go @@ -46,6 +46,7 @@ type EditUserOption struct { MustChangePassword *bool `json:"must_change_password"` Website *string `json:"website" binding:"OmitEmpty;ValidUrl;MaxSize(255)"` Location *string `json:"location" binding:"MaxSize(50)"` + Pronouns *string `json:"pronouns" binding:"MaxSize(50)"` Description *string `json:"description" binding:"MaxSize(255)"` Active *bool `json:"active"` Admin *bool `json:"admin"` diff --git a/modules/structs/user.go b/modules/structs/user.go index 89349cda2c757..89bd50d246887 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -91,6 +91,7 @@ type UserSettingsOptions struct { Website *string `json:"website" binding:"OmitEmpty;ValidUrl;MaxSize(255)"` Description *string `json:"description" binding:"MaxSize(255)"` Location *string `json:"location" binding:"MaxSize(50)"` + Pronouns *string `json:"pronouns" binding:"MaxSize(50)"` Language *string `json:"language"` Theme *string `json:"theme"` DiffViewStyle *string `json:"diff_view_style"` diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d7e73a0cfbb08..a16ccae7c7371 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -739,6 +739,7 @@ password_full_name_disabled = You are not allowed to change your full name. Plea full_name = Full Name website = Website location = Location +pronouns = Pronouns update_theme = Update Theme update_profile = Update Profile update_language = Update Language @@ -2840,6 +2841,7 @@ settings.full_name = Full Name settings.email = Contact Email Address settings.website = Website settings.location = Location +settings.pronouns = Pronouns settings.permission = Permissions settings.repoadminchangeteam = Repository admin can add and remove access for teams settings.visibility = Visibility diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 494bace585189..e96ec3861822d 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -238,6 +238,7 @@ func EditUser(ctx *context.APIContext) { Website: optional.FromPtr(form.Website), Location: optional.FromPtr(form.Location), Description: optional.FromPtr(form.Description), + Pronouns: optional.FromPtr(form.Pronouns), IsActive: optional.FromPtr(form.Active), IsAdmin: user_service.UpdateOptionFieldFromPtr(form.Admin), Visibility: optional.FromMapLookup(api.VisibilityModes, form.Visibility), diff --git a/routers/api/v1/user/settings.go b/routers/api/v1/user/settings.go index d67c54b339782..d644c22f3485c 100644 --- a/routers/api/v1/user/settings.go +++ b/routers/api/v1/user/settings.go @@ -48,6 +48,7 @@ func UpdateUserSettings(ctx *context.APIContext) { opts := &user_service.UpdateOptions{ FullName: optional.FromPtr(form.FullName), Description: optional.FromPtr(form.Description), + Pronouns: optional.FromPtr(form.Pronouns), Website: optional.FromPtr(form.Website), Location: optional.FromPtr(form.Location), Language: optional.FromPtr(form.Language), diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 27577cd35ba1c..b84b031a4ee5f 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -431,6 +431,7 @@ func EditUserPost(ctx *context.Context) { FullName: optional.Some(form.FullName), Website: optional.Some(form.Website), Location: optional.Some(form.Location), + Pronouns: optional.Some(form.Pronouns), IsActive: optional.Some(form.Active), IsAdmin: user_service.UpdateOptionFieldFromValue(form.Admin), AllowGitHook: optional.Some(form.AllowGitHook), diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 98995cd69c435..ce679e14e4efd 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -99,6 +99,7 @@ func ProfilePost(ctx *context.Context) { opts := &user_service.UpdateOptions{ KeepEmailPrivate: optional.Some(form.KeepEmailPrivate), Description: optional.Some(form.Description), + Pronouns: optional.Some(form.Pronouns), Website: optional.Some(form.Website), Location: optional.Some(form.Location), Visibility: optional.Some(form.Visibility), diff --git a/services/forms/admin.go b/services/forms/admin.go index 81276f8f46f9c..21186ddc64fa3 100644 --- a/services/forms/admin.go +++ b/services/forms/admin.go @@ -41,6 +41,7 @@ type AdminEditUserForm struct { Password string `binding:"MaxSize(255)"` Website string `binding:"ValidUrl;MaxSize(255)"` Location string `binding:"MaxSize(50)"` + Pronouns string `binding:"MaxSize(50)"` Language string `binding:"MaxSize(5)"` MaxRepoCreation int Active bool diff --git a/services/forms/user_form.go b/services/forms/user_form.go index ddf2bd09b0bb6..569942bb67dc9 100644 --- a/services/forms/user_form.go +++ b/services/forms/user_form.go @@ -216,6 +216,7 @@ type UpdateProfileForm struct { KeepEmailPrivate bool Website string `binding:"ValidSiteUrl;MaxSize(255)"` Location string `binding:"MaxSize(50)"` + Pronouns string `binding:"MaxSize(50)"` Description string `binding:"MaxSize(255)"` Visibility structs.VisibleType KeepActivityPrivate bool diff --git a/services/user/update.go b/services/user/update.go index d7354542bf680..5f2d6ebc1ac6f 100644 --- a/services/user/update.go +++ b/services/user/update.go @@ -41,6 +41,7 @@ type UpdateOptions struct { Website optional.Option[string] Location optional.Option[string] Description optional.Option[string] + Pronouns optional.Option[string] AllowGitHook optional.Option[bool] AllowImportLocal optional.Option[bool] MaxRepoCreation optional.Option[int] @@ -72,6 +73,11 @@ func UpdateUser(ctx context.Context, u *user_model.User, opts *UpdateOptions) er cols = append(cols, "full_name") } + if opts.Pronouns.Has() { + u.Pronouns = opts.Pronouns.Value() + + cols = append(cols, "pronouns") + } if opts.Website.Has() { u.Website = opts.Website.Value() diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 879b5cb550d30..7e3d88d74a90b 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -61,6 +61,10 @@ +
+ + +
diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl index 1190dc54eceb6..57aefb5335171 100644 --- a/templates/shared/user/profile_big_avatar.tmpl +++ b/templates/shared/user/profile_big_avatar.tmpl @@ -13,7 +13,7 @@
{{if .ContextUser.FullName}}{{.ContextUser.FullName}}{{end}} - {{.ContextUser.Name}} {{if .IsAdmin}} + {{.ContextUser.Name}}{{if .ContextUser.Pronouns}} ยท {{.ContextUser.Pronouns}}{{end}} {{if .IsAdmin}} {{svg "octicon-gear" 18}} diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index d8e5e27b896a6..05bc924fd550d 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -24,6 +24,10 @@

{{ctx.Locale.Tr "settings.password_full_name_disabled"}}

{{end}}
+
+ + +

{{.SignedUser.Email}}