add pronoun field to user profiles

models/user/user.go

@@ -95,6 +95,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)"`

modules/structs/admin_user.go

@@ -41,6 +41,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"`

modules/structs/user.go

@@ -87,6 +87,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"`

options/locale/locale_en-US.ini

@@ -701,6 +701,7 @@ password_username_disabled = Non-local users are not allowed to change their use
 full_name = Full name
 website = Website
 location = Location
+pronouns = Pronouns
 update_theme = Change theme
 update_profile = Update profile
 update_language = Change language

routers/api/v1/admin/user.go

@@ -236,6 +236,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:                 optional.FromPtr(form.Admin),
 		Visibility:              optional.FromNonDefault(api.VisibilityModes[form.Visibility]),

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),

routers/web/user/setting/profile.go

@@ -90,6 +90,7 @@ func ProfilePost(ctx *context.Context) {
 		FullName:            optional.Some(form.FullName),
 		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),

services/forms/user_form.go

@@ -218,6 +218,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

services/user/update.go

@@ -22,6 +22,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]
@@ -54,6 +55,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()
 

templates/shared/user/profile_big_avatar.tmpl

@@ -13,7 +13,7 @@
 	</div>
 	<div class="content gt-word-break profile-avatar-name">
 		{{if .ContextUser.FullName}}<span class="header text center">{{.ContextUser.FullName}}</span>{{end}}
-		<span class="username text center">{{.ContextUser.Name}} {{if .IsAdmin}}
+		<span class="username text center">{{.ContextUser.Name}}{{if .ContextUser.Pronouns}} · {{.ContextUser.Pronouns}}{{end}} {{if .IsAdmin}}
 					<a class="muted" href="{{AppSubUrl}}/admin/users/{{.ContextUser.ID}}" data-tooltip-content="{{ctx.Locale.Tr "admin.users.details"}}">
 						{{svg "octicon-gear" 18}}
 					</a>

templates/user/settings/profile.tmpl

@@ -37,6 +37,10 @@
 					<label for="location">{{ctx.Locale.Tr "settings.location"}}</label>
 					<input id="location" name="location" placeholder="{{ctx.Locale.Tr "settings.location_placeholder"}}" value="{{.SignedUser.Location}}" maxlength="50">
 				</div>
+				<div class="field">
+					<label for="pronouns">{{.locale.Tr "settings.pronouns"}}</label>
+					<input id="pronouns" name="pronouns" value="{{.SignedUser.Pronouns}}" maxlength="50">
+				</div>
 
 				<div class="divider"></div>
 				<!-- private block -->