Skip to content

Commit 711cbcc

Browse files
author
Gusted
authored
Use neutral language in comments and docs (#20135)
- Replace `his/her` to `their`, as it's more neutral language.
1 parent a8cdea0 commit 711cbcc

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

docs/content/doc/developers/oauth2-provider.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ To use the Authorization Code Grant as a third party application it is required
4141

4242
## Scopes
4343

44-
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.
44+
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.
4545

4646
## Example
4747

4848
**Note:** This example does not use PKCE.
4949

50-
1. Redirect to user to the authorization endpoint in order to get his/her consent for accessing the resources:
50+
1. Redirect to user to the authorization endpoint in order to get their consent for accessing the resources:
5151

5252
```curl
5353
https://[YOUR-GITEA-URL]/login/oauth/authorize?client_id=CLIENT_ID&redirect_uri=REDIRECT_URI& response_type=code&state=STATE

docs/content/doc/developers/oauth2-provider.zh-tw.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Gitea 支援作為 OAuth2 提供者,能讓第三方程式能在使用者同意
4646
**備註:** 此範例未使用 PKCE。
4747

4848
1. 重新導向使用者到 authorization endpoint 以獲得他同意授權存取資源:
49-
<!-- 1. Redirect to user to the authorization endpoint in order to get his/her consent for accessing the resources: -->
49+
<!-- 1. Redirect to user to the authorization endpoint in order to get their consent for accessing the resources: -->
5050

5151
```curl
5252
https://[YOUR-GITEA-URL]/login/oauth/authorize?client_id=CLIENT_ID&redirect_uri=REDIRECT_URI& response_type=code&state=STATE

models/migrations/v154.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func addTimeStamps(x *xorm.Engine) error {
3030
return err
3131
}
3232

33-
// Follow represents relations of user and his/her followers.
33+
// Follow represents relations of user and their followers.
3434
type Follow struct {
3535
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
3636
}

models/org.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func removeOrgUser(ctx context.Context, orgID, userID int64) error {
149149
}
150150
}
151151

152-
// Delete member in his/her teams.
152+
// Delete member in their teams.
153153
teams, err := organization.GetUserOrgTeams(ctx, org.ID, userID)
154154
if err != nil {
155155
return err

models/user/follow.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"code.gitea.io/gitea/modules/timeutil"
1010
)
1111

12-
// Follow represents relations of user and his/her followers.
12+
// Follow represents relations of user and their followers.
1313
type Follow struct {
1414
ID int64 `xorm:"pk autoincr"`
1515
UserID int64 `xorm:"UNIQUE(follow)"`

models/user/user.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ type User struct {
8686
PasswdHashAlgo string `xorm:"NOT NULL DEFAULT 'argon2'"`
8787

8888
// MustChangePassword is an attribute that determines if a user
89-
// is to change his/her password after registration.
89+
// is to change their password after registration.
9090
MustChangePassword bool `xorm:"NOT NULL DEFAULT false"`
9191

9292
LoginType auth.Type
@@ -537,7 +537,7 @@ func GetUserSalt() (string, error) {
537537
return hex.EncodeToString(rBytes), nil
538538
}
539539

540-
// NewGhostUser creates and returns a fake user for someone has deleted his/her account.
540+
// NewGhostUser creates and returns a fake user for someone has deleted their account.
541541
func NewGhostUser() *User {
542542
return &User{
543543
ID: -1,

routers/web/auth/password.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ func MustChangePassword(ctx *context.Context) {
274274
ctx.HTML(http.StatusOK, tplMustChangePassword)
275275
}
276276

277-
// MustChangePasswordPost response for updating a user's password after his/her
277+
// MustChangePasswordPost response for updating a user's password after their
278278
// account was created by an admin
279279
func MustChangePasswordPost(ctx *context.Context) {
280280
form := web.GetForm(ctx).(*forms.MustChangePasswordForm)

0 commit comments

Comments
 (0)