summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorJesús Espino <jespinog@gmail.com>2018-03-29 16:04:54 +0200
committerHarrison Healey <harrisonmhealey@gmail.com>2018-03-29 10:04:54 -0400
commit014a3b6a60610ba592c5843080686f4481553136 (patch)
tree883ac2be9c96de5a8c4f34b2881da84c1fd65e21 /utils
parenteb48292a3a69ac5ffac91cdb0c5e5349ae8f85eb (diff)
downloadchat-014a3b6a60610ba592c5843080686f4481553136.tar.gz
chat-014a3b6a60610ba592c5843080686f4481553136.tar.bz2
chat-014a3b6a60610ba592c5843080686f4481553136.zip
Fixing misspell errors (#8544)
Diffstat (limited to 'utils')
-rw-r--r--utils/config_test.go12
-rw-r--r--utils/i18n.go2
-rw-r--r--utils/mail.go2
3 files changed, 8 insertions, 8 deletions
diff --git a/utils/config_test.go b/utils/config_test.go
index f816e2ee8..84e7291b0 100644
--- a/utils/config_test.go
+++ b/utils/config_test.go
@@ -50,7 +50,7 @@ func TestFindConfigFile(t *testing.T) {
}
func TestConfigFromEnviroVars(t *testing.T) {
- os.Setenv("MM_TEAMSETTINGS_SITENAME", "From Enviroment")
+ os.Setenv("MM_TEAMSETTINGS_SITENAME", "From Environment")
os.Setenv("MM_TEAMSETTINGS_CUSTOMBRANDTEXT", "Custom Brand")
os.Setenv("MM_SERVICESETTINGS_ENABLECOMMANDS", "false")
os.Setenv("MM_SERVICESETTINGS_READTIMEOUT", "400")
@@ -59,20 +59,20 @@ func TestConfigFromEnviroVars(t *testing.T) {
cfg, cfgPath, err := LoadConfig("config.json")
require.Nil(t, err)
- if cfg.TeamSettings.SiteName != "From Enviroment" {
- t.Fatal("Couldn't read config from enviroment var")
+ if cfg.TeamSettings.SiteName != "From Environment" {
+ t.Fatal("Couldn't read config from environment var")
}
if *cfg.TeamSettings.CustomBrandText != "Custom Brand" {
- t.Fatal("Couldn't read config from enviroment var")
+ t.Fatal("Couldn't read config from environment var")
}
if *cfg.ServiceSettings.EnableCommands {
- t.Fatal("Couldn't read config from enviroment var")
+ t.Fatal("Couldn't read config from environment var")
}
if *cfg.ServiceSettings.ReadTimeout != 400 {
- t.Fatal("Couldn't read config from enviroment var")
+ t.Fatal("Couldn't read config from environment var")
}
os.Unsetenv("MM_TEAMSETTINGS_SITENAME")
diff --git a/utils/i18n.go b/utils/i18n.go
index 7b8d1fef0..72704c241 100644
--- a/utils/i18n.go
+++ b/utils/i18n.go
@@ -96,7 +96,7 @@ func GetUserTranslations(locale string) i18n.TranslateFunc {
func GetTranslationsAndLocale(w http.ResponseWriter, r *http.Request) (i18n.TranslateFunc, string) {
// This is for checking against locales like pt_BR or zn_CN
headerLocaleFull := strings.Split(r.Header.Get("Accept-Language"), ",")[0]
- // This is for checking agains locales like en, es
+ // This is for checking against locales like en, es
headerLocale := strings.Split(strings.Split(r.Header.Get("Accept-Language"), ",")[0], "-")[0]
defaultLocale := *settings.DefaultClientLocale
if locales[headerLocaleFull] != "" {
diff --git a/utils/mail.go b/utils/mail.go
index 43630471c..ee5a8dd6f 100644
--- a/utils/mail.go
+++ b/utils/mail.go
@@ -82,7 +82,7 @@ func (a *loginAuth) Next(fromServer []byte, more bool) ([]byte, error) {
case "Password:":
return []byte(a.password), nil
default:
- return nil, errors.New("Unkown fromServer")
+ return nil, errors.New("Unknown fromServer")
}
}
return nil, nil