From a4ece1f22391a3602631ada5cb89797e134c4e13 Mon Sep 17 00:00:00 2001 From: Bwko Date: Sun, 27 Nov 2016 12:59:12 +0100 Subject: [PATCH] Fixes typos --- conf/locale/locale_en-US.ini | 2 +- conf/locale/locale_sv-SE.ini | 2 +- models/org.go | 2 +- models/user.go | 2 +- models/user_mail.go | 12 ++++++------ routers/repo/setting.go | 2 +- routers/repo/webhook.go | 2 +- routers/user/home.go | 2 +- routers/user/setting.go | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index b6e47594d1a..d7b407cd27d 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -1173,7 +1173,7 @@ close_pull_request = `closed pull request %s#%[2]s` reopen_pull_request = `reopened pull request %s#%[2]s` comment_issue = `commented on issue %s#%[2]s` merge_pull_request = `merged pull request %s#%[2]s` -transfer_repo = transfered repository %s to %s +transfer_repo = transferred repository %s to %s push_tag = pushed tag %[2]s to %[3]s compare_commits = View comparison for these %d commits diff --git a/conf/locale/locale_sv-SE.ini b/conf/locale/locale_sv-SE.ini index c37deb34db6..67ed6186616 100644 --- a/conf/locale/locale_sv-SE.ini +++ b/conf/locale/locale_sv-SE.ini @@ -1167,7 +1167,7 @@ close_pull_request=`closed pull request %s#%[2]s` reopen_pull_request=`reopened pull request %s#%[2]s` comment_issue=`commented on issue %s#%[2]s` merge_pull_request=`merged pull request %s#%[2]s` -transfer_repo=transfered repository %s to %s +transfer_repo=transferred repository %s to %s push_tag=pushed tag %[2]s to %[3]s compare_commits=View comparison for these %d commits diff --git a/models/org.go b/models/org.go index 1d2ff1300f9..3b04ed578c2 100644 --- a/models/org.go +++ b/models/org.go @@ -500,7 +500,7 @@ func (org *User) getUserTeams(e Engine, userID int64, cols ...string) ([]*Team, Find(&teams) } -// GetUserTeamIDs returns of all team IDs of the organization that user is memeber of. +// GetUserTeamIDs returns of all team IDs of the organization that user is member of. func (org *User) GetUserTeamIDs(userID int64) ([]int64, error) { teams, err := org.getUserTeams(x, userID, "team.id") if err != nil { diff --git a/models/user.go b/models/user.go index 1e15b2a9656..34bf685a7d3 100644 --- a/models/user.go +++ b/models/user.go @@ -80,7 +80,7 @@ type User struct { // Remember visibility choice for convenience, true for private LastRepoVisibility bool - // Maximum repository creation limit, -1 means use gloabl default + // Maximum repository creation limit, -1 means use global default MaxRepoCreation int `xorm:"NOT NULL DEFAULT -1"` // Permissions diff --git a/models/user_mail.go b/models/user_mail.go index 3fc4f4ae897..69f87c2b372 100644 --- a/models/user_mail.go +++ b/models/user_mail.go @@ -81,12 +81,12 @@ func addEmailAddress(e Engine, email *EmailAddress) error { return err } -// AddEmailAddress adds an email adress to given user. +// AddEmailAddress adds an email address to given user. func AddEmailAddress(email *EmailAddress) error { return addEmailAddress(x, email) } -// AddEmailAddresses adds an email adress to given user. +// AddEmailAddresses adds an email address to given user. func AddEmailAddresses(emails []*EmailAddress) error { if len(emails) == 0 { return nil @@ -110,7 +110,7 @@ func AddEmailAddresses(emails []*EmailAddress) error { return nil } -// Activate activates the email adress to given user. +// Activate activates the email address to given user. func (email *EmailAddress) Activate() error { user, err := GetUserByID(email.UID) if err != nil { @@ -137,7 +137,7 @@ func (email *EmailAddress) Activate() error { return sess.Commit() } -// DeleteEmailAddress deletes an email adress of given user. +// DeleteEmailAddress deletes an email address of given user. func DeleteEmailAddress(email *EmailAddress) (err error) { if email.ID > 0 { _, err = x.Id(email.ID).Delete(new(EmailAddress)) @@ -149,7 +149,7 @@ func DeleteEmailAddress(email *EmailAddress) (err error) { return err } -// DeleteEmailAddresses deletes multiple email adresses +// DeleteEmailAddresses deletes multiple email addresses func DeleteEmailAddresses(emails []*EmailAddress) (err error) { for i := range emails { if err = DeleteEmailAddress(emails[i]); err != nil { @@ -160,7 +160,7 @@ func DeleteEmailAddresses(emails []*EmailAddress) (err error) { return nil } -// MakeEmailPrimary sets primary email adress of given user. +// MakeEmailPrimary sets primary email address of given user. func MakeEmailPrimary(email *EmailAddress) error { has, err := x.Get(email) if err != nil { diff --git a/routers/repo/setting.go b/routers/repo/setting.go index aaba5427fcf..e29f0fcb1f3 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -231,7 +231,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { } return } - log.Trace("Repository transfered: %s/%s -> %s", ctx.Repo.Owner.Name, repo.Name, newOwner) + log.Trace("Repository transferred: %s/%s -> %s", ctx.Repo.Owner.Name, repo.Name, newOwner) ctx.Flash.Success(ctx.Tr("repo.settings.transfer_succeed")) ctx.Redirect(setting.AppSubURL + "/" + newOwner + "/" + repo.Name) diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index 33ad834c952..5a4770cdf31 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -310,7 +310,7 @@ func WebHooksEditPost(ctx *context.Context, form auth.NewWebhookForm) { ctx.Redirect(fmt.Sprintf("%s/settings/hooks/%d", orCtx.Link, w.ID)) } -// SlackHooksEditPost reponse for editing slack hook +// SlackHooksEditPost response for editing slack hook func SlackHooksEditPost(ctx *context.Context, form auth.NewSlackHookForm) { ctx.Data["Title"] = ctx.Tr("repo.settings") ctx.Data["PageIsSettingsHooks"] = true diff --git a/routers/user/home.go b/routers/user/home.go index 5745791e48b..a08fae07273 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -313,7 +313,7 @@ func Issues(ctx *context.Context) { ctx.HTML(200, tplIssues) } -// ShowSSHKeys ouput all the ssh keys of user by uid +// ShowSSHKeys output all the ssh keys of user by uid func ShowSSHKeys(ctx *context.Context, uid int64) { keys, err := models.ListPublicKeys(uid) if err != nil { diff --git a/routers/user/setting.go b/routers/user/setting.go index 018881e8b21..1d405fba375 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -285,7 +285,7 @@ func SettingsEmailPost(ctx *context.Context, form auth.AddEmailForm) { ctx.Redirect(setting.AppSubURL + "/user/settings/email") } -// DeleteEmail reponse for delete user's email +// DeleteEmail response for delete user's email func DeleteEmail(ctx *context.Context) { if err := models.DeleteEmailAddress(&models.EmailAddress{ID: ctx.QueryInt64("id")}); err != nil { ctx.Handle(500, "DeleteEmail", err)