Add support for pronouns

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)"`

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"`

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"`

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

routers/api/v1/admin/user.go

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

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

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

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

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

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

templates/admin/user/edit.tmpl

@@ -61,6 +61,10 @@
 					<label for="full_name">{{ctx.Locale.Tr "settings.full_name"}}</label>
 					<input id="full_name" name="full_name" value="{{.User.FullName}}" maxlength="100">
 				</div>
+				<div class="field">
+					<label for="pronouns">{{ctx.Locale.Tr "settings.pronouns"}}</label>
+					<input id="pronouns" name="pronouns" value="{{.User.Pronouns}}" maxlength="50">
+				</div>
 				<div class="required field {{if .Err_Email}}error{{end}}">
 					<label for="email">{{ctx.Locale.Tr "email"}}</label>
 					<input id="email" name="email" type="email" value="{{.User.Email}}" required>

templates/shared/user/profile_big_avatar.tmpl

@@ -13,7 +13,7 @@
 	</div>
 	<div class="content tw-break-anywhere 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

@@ -24,6 +24,10 @@
 					<p class="help text blue">{{ctx.Locale.Tr "settings.password_full_name_disabled"}}</p>
 					{{end}}
 				</div>
+                                <div class="field">
+                                        <label for="pronouns">{{ctx.Locale.Tr "settings.pronouns"}}</label>
+                                        <input id="pronouns" name="pronouns" value="{{.SignedUser.Pronouns}}" maxlength="50">
+                                </div>
 				<div class="field {{if .Err_Email}}error{{end}}">
 					<label>{{ctx.Locale.Tr "email"}}</label>
 					<p id="signed-user-email">{{.SignedUser.Email}}</p>