Skip to content

Fixes typos #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conf/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ close_pull_request = `closed pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
reopen_pull_request = `reopened pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
comment_issue = `commented on issue <a href="%s/issues/%s">%s#%[2]s</a>`
merge_pull_request = `merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
transfer_repo = transfered repository <code>%s</code> to <a href="%s">%s</a>
transfer_repo = transferred repository <code>%s</code> to <a href="%s">%s</a>
push_tag = pushed tag <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a>
compare_commits = View comparison for these %d commits

Expand Down
2 changes: 1 addition & 1 deletion conf/locale/locale_sv-SE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,7 @@ close_pull_request=`closed pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
reopen_pull_request=`reopened pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
comment_issue=`commented on issue <a href="%s/issues/%s">%s#%[2]s</a>`
merge_pull_request=`merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
transfer_repo=transfered repository <code>%s</code> to <a href="%s">%s</a>
transfer_repo=transferred repository <code>%s</code> to <a href="%s">%s</a>
push_tag=pushed tag <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a>
compare_commits=View comparison for these %d commits

Expand Down
2 changes: 1 addition & 1 deletion models/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion models/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions models/user_mail.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand All @@ -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))
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion routers/repo/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion routers/user/home.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion routers/user/setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down