diff --git a/models/issue.go b/models/issue.go index cee8c36aa18..2b2e8bd6182 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1297,7 +1297,7 @@ func changeMilestoneIssueStats(e *xorm.Session, issue *Issue) error { } // ChangeMilestoneIssueStats updates the open/closed issues counter and progress -// for the milestone associated witht the given issue. +// for the milestone associated with the given issue. func ChangeMilestoneIssueStats(issue *Issue) (err error) { sess := x.NewSession() defer sessionRelease(sess) diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go index 75795cf6dbb..313c235508b 100644 --- a/modules/auth/ldap/ldap.go +++ b/modules/auth/ldap/ldap.go @@ -102,7 +102,7 @@ func (ls *Source) FindUserDN(name string) (string, bool) { userDN := sr.Entries[0].DN if userDN == "" { - log.Error(4, "LDAP search was succesful, but found no DN!") + log.Error(4, "LDAP search was successful, but found no DN!") return "", false } diff --git a/modules/bindata/bindata.go b/modules/bindata/bindata.go index 3286492c009..f6f9b26fcda 100644 --- a/modules/bindata/bindata.go +++ b/modules/bindata/bindata.go @@ -4628,8 +4628,8 @@ func confReadmeDefault() (*asset, error) { // It returns an error if the asset could not be found or // could not be loaded. func Asset(name string) ([]byte, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { + canonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[canonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) @@ -4654,8 +4654,8 @@ func MustAsset(name string) []byte { // It returns an error if the asset could not be found or // could not be loaded. func AssetInfo(name string) (os.FileInfo, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { + canonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[canonicalName]; ok { a, err := f() if err != nil { return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) @@ -4911,8 +4911,8 @@ var _bindata = map[string]func() (*asset, error){ func AssetDir(name string) ([]string, error) { node := _bintree if len(name) != 0 { - cannonicalName := strings.Replace(name, "\\", "/", -1) - pathList := strings.Split(cannonicalName, "/") + canonicalName := strings.Replace(name, "\\", "/", -1) + pathList := strings.Split(canonicalName, "/") for _, p := range pathList { node = node.Children[p] if node == nil { @@ -5424,7 +5424,7 @@ func RestoreAssets(dir, name string) error { } func _filePath(dir, name string) string { - cannonicalName := strings.Replace(name, "\\", "/", -1) - return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) + canonicalName := strings.Replace(name, "\\", "/", -1) + return filepath.Join(append([]string{dir}, strings.Split(canonicalName, "/")...)...) }