TRKJ/gitea
2
0
Fork 0
mirror of https://gitee.com/gitea/gitea synced 2025-11-04 08:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use neutral language in comments and docs (#20135)

Browse Source 
- Replace `his/her` to `their`, as it's more neutral language.
This commit is contained in:
Gusted
2022-06-26 00:50:12 +02:00
committed by GitHub
parent a8cdea013d
commit 711cbcce8d
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/content/doc/developers/oauth2-provider.md
View File

@@ -41,13 +41,13 @@ To use the Authorization Code Grant as a third party application it is required
## Scopes ## 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 ## Example
**Note:** This example does not use PKCE. **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 ```curl
https://[YOUR-GITEA-URL]/login/oauth/authorize?client_id=CLIENT_ID&redirect_uri=REDIRECT_URI& response_type=code&state=STATE https://[YOUR-GITEA-URL]/login/oauth/authorize?client_id=CLIENT_ID&redirect_uri=REDIRECT_URI& response_type=code&state=STATE

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

@@ -46,7 +46,7 @@ Gitea 支援作為 OAuth2 提供者，能讓第三方程式能在使用者同意
**備註：** 此範例未使用 PKCE。 **備註：** 此範例未使用 PKCE。
1. 重新導向使用者到 authorization endpoint 以獲得他同意授權存取資源： 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 ```curl
https://[YOUR-GITEA-URL]/login/oauth/authorize?client_id=CLIENT_ID&redirect_uri=REDIRECT_URI& response_type=code&state=STATE https://[YOUR-GITEA-URL]/login/oauth/authorize?client_id=CLIENT_ID&redirect_uri=REDIRECT_URI& response_type=code&state=STATE

2
models/migrations/v154.go
View File

@@ -30,7 +30,7 @@ func addTimeStamps(x *xorm.Engine) error {
return err return err
} }
// Follow represents relations of user and his/her followers. // Follow represents relations of user and their followers.
type Follow struct { type Follow struct {
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
} }

2
models/org.go
View File

@@ -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) teams, err := organization.GetUserOrgTeams(ctx, org.ID, userID)
if err != nil { if err != nil {
return err return err

2
models/user/follow.go
View File

@@ -9,7 +9,7 @@ import (
"code.gitea.io/gitea/modules/timeutil" "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 { type Follow struct {
ID int64 `xorm:"pk autoincr"` ID int64 `xorm:"pk autoincr"`
UserID int64 `xorm:"UNIQUE(follow)"` UserID int64 `xorm:"UNIQUE(follow)"`

4
models/user/user.go
View File

@@ -86,7 +86,7 @@ type User struct {
PasswdHashAlgo string `xorm:"NOT NULL DEFAULT 'argon2'"` PasswdHashAlgo string `xorm:"NOT NULL DEFAULT 'argon2'"`
// MustChangePassword is an attribute that determines if a user // 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"` MustChangePassword bool `xorm:"NOT NULL DEFAULT false"`
LoginType auth.Type LoginType auth.Type
@@ -537,7 +537,7 @@ func GetUserSalt() (string, error) {
return hex.EncodeToString(rBytes), nil 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 { func NewGhostUser() *User {
return &User{ return &User{
ID: -1, ID: -1,

2
routers/web/auth/password.go
View File

@@ -274,7 +274,7 @@ func MustChangePassword(ctx *context.Context) {
ctx.HTML(http.StatusOK, tplMustChangePassword) 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 // account was created by an admin
func MustChangePasswordPost(ctx *context.Context) { func MustChangePasswordPost(ctx *context.Context) {
form := web.GetForm(ctx).(*forms.MustChangePasswordForm) form := web.GetForm(ctx).(*forms.MustChangePasswordForm)