mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Use neutral language in comments and docs (#20135)
- Replace `his/her` to `their`, as it's more neutral language.
This commit is contained in:
		@@ -41,13 +41,13 @@ To use the Authorization Code Grant as a third party application it is required
 | 
			
		||||
 | 
			
		||||
## Scopes
 | 
			
		||||
 | 
			
		||||
Currently Gitea does not support scopes (see [#4300](https://github.com/go-gitea/gitea/issues/4300)) and all third party applications will be granted access to all resources of the user and his/her organizations.
 | 
			
		||||
Currently Gitea does not support scopes (see [#4300](https://github.com/go-gitea/gitea/issues/4300)) and all third party applications will be granted access to all resources of the user and their organizations.
 | 
			
		||||
 | 
			
		||||
## Example
 | 
			
		||||
 | 
			
		||||
**Note:** This example does not use PKCE.
 | 
			
		||||
 | 
			
		||||
1. Redirect to user to the authorization endpoint in order to get his/her consent for accessing the resources:
 | 
			
		||||
1. Redirect to user to the authorization endpoint in order to get their consent for accessing the resources:
 | 
			
		||||
 | 
			
		||||
   ```curl
 | 
			
		||||
   https://[YOUR-GITEA-URL]/login/oauth/authorize?client_id=CLIENT_ID&redirect_uri=REDIRECT_URI& response_type=code&state=STATE
 | 
			
		||||
 
 | 
			
		||||
@@ -46,7 +46,7 @@ Gitea 支援作為 OAuth2 提供者,能讓第三方程式能在使用者同意
 | 
			
		||||
**備註:** 此範例未使用 PKCE。
 | 
			
		||||
 | 
			
		||||
1. 重新導向使用者到 authorization endpoint 以獲得他同意授權存取資源:
 | 
			
		||||
    <!-- 1. Redirect to user to the authorization endpoint in order to get his/her consent for accessing the resources: -->
 | 
			
		||||
    <!-- 1. Redirect to user to the authorization endpoint in order to get their consent for accessing the resources: -->
 | 
			
		||||
 | 
			
		||||
   ```curl
 | 
			
		||||
   https://[YOUR-GITEA-URL]/login/oauth/authorize?client_id=CLIENT_ID&redirect_uri=REDIRECT_URI& response_type=code&state=STATE
 | 
			
		||||
 
 | 
			
		||||
@@ -30,7 +30,7 @@ func addTimeStamps(x *xorm.Engine) error {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Follow represents relations of user and his/her followers.
 | 
			
		||||
	// Follow represents relations of user and their followers.
 | 
			
		||||
	type Follow struct {
 | 
			
		||||
		CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -149,7 +149,7 @@ func removeOrgUser(ctx context.Context, orgID, userID int64) error {
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Delete member in his/her teams.
 | 
			
		||||
	// Delete member in their teams.
 | 
			
		||||
	teams, err := organization.GetUserOrgTeams(ctx, org.ID, userID)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
 
 | 
			
		||||
@@ -9,7 +9,7 @@ import (
 | 
			
		||||
	"code.gitea.io/gitea/modules/timeutil"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// Follow represents relations of user and his/her followers.
 | 
			
		||||
// Follow represents relations of user and their followers.
 | 
			
		||||
type Follow struct {
 | 
			
		||||
	ID          int64              `xorm:"pk autoincr"`
 | 
			
		||||
	UserID      int64              `xorm:"UNIQUE(follow)"`
 | 
			
		||||
 
 | 
			
		||||
@@ -86,7 +86,7 @@ type User struct {
 | 
			
		||||
	PasswdHashAlgo               string `xorm:"NOT NULL DEFAULT 'argon2'"`
 | 
			
		||||
 | 
			
		||||
	// MustChangePassword is an attribute that determines if a user
 | 
			
		||||
	// is to change his/her password after registration.
 | 
			
		||||
	// is to change their password after registration.
 | 
			
		||||
	MustChangePassword bool `xorm:"NOT NULL DEFAULT false"`
 | 
			
		||||
 | 
			
		||||
	LoginType   auth.Type
 | 
			
		||||
@@ -537,7 +537,7 @@ func GetUserSalt() (string, error) {
 | 
			
		||||
	return hex.EncodeToString(rBytes), nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// NewGhostUser creates and returns a fake user for someone has deleted his/her account.
 | 
			
		||||
// NewGhostUser creates and returns a fake user for someone has deleted their account.
 | 
			
		||||
func NewGhostUser() *User {
 | 
			
		||||
	return &User{
 | 
			
		||||
		ID:        -1,
 | 
			
		||||
 
 | 
			
		||||
@@ -274,7 +274,7 @@ func MustChangePassword(ctx *context.Context) {
 | 
			
		||||
	ctx.HTML(http.StatusOK, tplMustChangePassword)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// MustChangePasswordPost response for updating a user's password after his/her
 | 
			
		||||
// MustChangePasswordPost response for updating a user's password after their
 | 
			
		||||
// account was created by an admin
 | 
			
		||||
func MustChangePasswordPost(ctx *context.Context) {
 | 
			
		||||
	form := web.GetForm(ctx).(*forms.MustChangePasswordForm)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user