Skip to content

Commit e6da2cf

Browse files
authored
Merge pull request #281 from Bwko/Lint/typos
Fixes typos
2 parents 5efdccd + a4ece1f commit e6da2cf

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

Diff for: conf/locale/locale_en-US.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,7 @@ close_pull_request = `closed pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
11731173
reopen_pull_request = `reopened pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
11741174
comment_issue = `commented on issue <a href="%s/issues/%s">%s#%[2]s</a>`
11751175
merge_pull_request = `merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
1176-
transfer_repo = transfered repository <code>%s</code> to <a href="%s">%s</a>
1176+
transfer_repo = transferred repository <code>%s</code> to <a href="%s">%s</a>
11771177
push_tag = pushed tag <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a>
11781178
compare_commits = View comparison for these %d commits
11791179

Diff for: conf/locale/locale_sv-SE.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ close_pull_request=`closed pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
11671167
reopen_pull_request=`reopened pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
11681168
comment_issue=`commented on issue <a href="%s/issues/%s">%s#%[2]s</a>`
11691169
merge_pull_request=`merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
1170-
transfer_repo=transfered repository <code>%s</code> to <a href="%s">%s</a>
1170+
transfer_repo=transferred repository <code>%s</code> to <a href="%s">%s</a>
11711171
push_tag=pushed tag <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a>
11721172
compare_commits=View comparison for these %d commits
11731173

Diff for: models/org.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ func (org *User) getUserTeams(e Engine, userID int64, cols ...string) ([]*Team,
500500
Find(&teams)
501501
}
502502

503-
// GetUserTeamIDs returns of all team IDs of the organization that user is memeber of.
503+
// GetUserTeamIDs returns of all team IDs of the organization that user is member of.
504504
func (org *User) GetUserTeamIDs(userID int64) ([]int64, error) {
505505
teams, err := org.getUserTeams(x, userID, "team.id")
506506
if err != nil {

Diff for: models/user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ type User struct {
8080

8181
// Remember visibility choice for convenience, true for private
8282
LastRepoVisibility bool
83-
// Maximum repository creation limit, -1 means use gloabl default
83+
// Maximum repository creation limit, -1 means use global default
8484
MaxRepoCreation int `xorm:"NOT NULL DEFAULT -1"`
8585

8686
// Permissions

Diff for: models/user_mail.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ func addEmailAddress(e Engine, email *EmailAddress) error {
8181
return err
8282
}
8383

84-
// AddEmailAddress adds an email adress to given user.
84+
// AddEmailAddress adds an email address to given user.
8585
func AddEmailAddress(email *EmailAddress) error {
8686
return addEmailAddress(x, email)
8787
}
8888

89-
// AddEmailAddresses adds an email adress to given user.
89+
// AddEmailAddresses adds an email address to given user.
9090
func AddEmailAddresses(emails []*EmailAddress) error {
9191
if len(emails) == 0 {
9292
return nil
@@ -110,7 +110,7 @@ func AddEmailAddresses(emails []*EmailAddress) error {
110110
return nil
111111
}
112112

113-
// Activate activates the email adress to given user.
113+
// Activate activates the email address to given user.
114114
func (email *EmailAddress) Activate() error {
115115
user, err := GetUserByID(email.UID)
116116
if err != nil {
@@ -137,7 +137,7 @@ func (email *EmailAddress) Activate() error {
137137
return sess.Commit()
138138
}
139139

140-
// DeleteEmailAddress deletes an email adress of given user.
140+
// DeleteEmailAddress deletes an email address of given user.
141141
func DeleteEmailAddress(email *EmailAddress) (err error) {
142142
if email.ID > 0 {
143143
_, err = x.Id(email.ID).Delete(new(EmailAddress))
@@ -149,7 +149,7 @@ func DeleteEmailAddress(email *EmailAddress) (err error) {
149149
return err
150150
}
151151

152-
// DeleteEmailAddresses deletes multiple email adresses
152+
// DeleteEmailAddresses deletes multiple email addresses
153153
func DeleteEmailAddresses(emails []*EmailAddress) (err error) {
154154
for i := range emails {
155155
if err = DeleteEmailAddress(emails[i]); err != nil {
@@ -160,7 +160,7 @@ func DeleteEmailAddresses(emails []*EmailAddress) (err error) {
160160
return nil
161161
}
162162

163-
// MakeEmailPrimary sets primary email adress of given user.
163+
// MakeEmailPrimary sets primary email address of given user.
164164
func MakeEmailPrimary(email *EmailAddress) error {
165165
has, err := x.Get(email)
166166
if err != nil {

Diff for: routers/repo/setting.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
231231
}
232232
return
233233
}
234-
log.Trace("Repository transfered: %s/%s -> %s", ctx.Repo.Owner.Name, repo.Name, newOwner)
234+
log.Trace("Repository transferred: %s/%s -> %s", ctx.Repo.Owner.Name, repo.Name, newOwner)
235235
ctx.Flash.Success(ctx.Tr("repo.settings.transfer_succeed"))
236236
ctx.Redirect(setting.AppSubURL + "/" + newOwner + "/" + repo.Name)
237237

Diff for: routers/repo/webhook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ func WebHooksEditPost(ctx *context.Context, form auth.NewWebhookForm) {
310310
ctx.Redirect(fmt.Sprintf("%s/settings/hooks/%d", orCtx.Link, w.ID))
311311
}
312312

313-
// SlackHooksEditPost reponse for editing slack hook
313+
// SlackHooksEditPost response for editing slack hook
314314
func SlackHooksEditPost(ctx *context.Context, form auth.NewSlackHookForm) {
315315
ctx.Data["Title"] = ctx.Tr("repo.settings")
316316
ctx.Data["PageIsSettingsHooks"] = true

Diff for: routers/user/home.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ func Issues(ctx *context.Context) {
313313
ctx.HTML(200, tplIssues)
314314
}
315315

316-
// ShowSSHKeys ouput all the ssh keys of user by uid
316+
// ShowSSHKeys output all the ssh keys of user by uid
317317
func ShowSSHKeys(ctx *context.Context, uid int64) {
318318
keys, err := models.ListPublicKeys(uid)
319319
if err != nil {

Diff for: routers/user/setting.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ func SettingsEmailPost(ctx *context.Context, form auth.AddEmailForm) {
285285
ctx.Redirect(setting.AppSubURL + "/user/settings/email")
286286
}
287287

288-
// DeleteEmail reponse for delete user's email
288+
// DeleteEmail response for delete user's email
289289
func DeleteEmail(ctx *context.Context) {
290290
if err := models.DeleteEmailAddress(&models.EmailAddress{ID: ctx.QueryInt64("id")}); err != nil {
291291
ctx.Handle(500, "DeleteEmail", err)

0 commit comments

Comments
 (0)