diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-11-02 07:56:12 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-11-02 07:56:12 -0500 |
commit | 359039980048aab2f89ac423e4be55914c948e69 (patch) | |
tree | be88398d0bbad5a0a3be57422635931508ab86d6 /store/sql_team_store.go | |
parent | 8282d4077933c7ac8039fb45a563ba62609d2457 (diff) | |
parent | 42d3694e4bf59c4b71f89f9c02938a23c9bbd84d (diff) | |
download | chat-359039980048aab2f89ac423e4be55914c948e69.tar.gz chat-359039980048aab2f89ac423e4be55914c948e69.tar.bz2 chat-359039980048aab2f89ac423e4be55914c948e69.zip |
Merge pull request #1246 from trashcan/fix-spelling
Fix spelling of "encountered" and "environment"
Diffstat (limited to 'store/sql_team_store.go')
-rw-r--r-- | store/sql_team_store.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/store/sql_team_store.go b/store/sql_team_store.go index ebf982ec4..dfc07d3d8 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -97,7 +97,7 @@ func (s SqlTeamStore) Update(team *model.Team) StoreChannel { } if oldResult, err := s.GetMaster().Get(model.Team{}, team.Id); err != nil { - result.Err = model.NewAppError("SqlTeamStore.Update", "We encounted an error finding the team", "id="+team.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlTeamStore.Update", "We encountered an error finding the team", "id="+team.Id+", "+err.Error()) } else if oldResult == nil { result.Err = model.NewAppError("SqlTeamStore.Update", "We couldn't find the existing team to update", "id="+team.Id) } else { @@ -107,7 +107,7 @@ func (s SqlTeamStore) Update(team *model.Team) StoreChannel { team.Name = oldTeam.Name if count, err := s.GetMaster().Update(team); err != nil { - result.Err = model.NewAppError("SqlTeamStore.Update", "We encounted an error updating the team", "id="+team.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlTeamStore.Update", "We encountered an error updating the team", "id="+team.Id+", "+err.Error()) } else if count != 1 { result.Err = model.NewAppError("SqlTeamStore.Update", "We couldn't update the team", "id="+team.Id) } else { @@ -149,7 +149,7 @@ func (s SqlTeamStore) Get(id string) StoreChannel { result := StoreResult{} if obj, err := s.GetReplica().Get(model.Team{}, id); err != nil { - result.Err = model.NewAppError("SqlTeamStore.Get", "We encounted an error finding the team", "id="+id+", "+err.Error()) + result.Err = model.NewAppError("SqlTeamStore.Get", "We encountered an error finding the team", "id="+id+", "+err.Error()) } else if obj == nil { result.Err = model.NewAppError("SqlTeamStore.Get", "We couldn't find the existing team", "id="+id) } else { @@ -230,7 +230,7 @@ func (s SqlTeamStore) GetTeamsForEmail(email string) StoreChannel { var data []*model.Team if _, err := s.GetReplica().Select(&data, "SELECT Teams.* FROM Teams, Users WHERE Teams.Id = Users.TeamId AND Users.Email = :Email", map[string]interface{}{"Email": email}); err != nil { - result.Err = model.NewAppError("SqlTeamStore.GetTeamsForEmail", "We encounted a problem when looking up teams", "email="+email+", "+err.Error()) + result.Err = model.NewAppError("SqlTeamStore.GetTeamsForEmail", "We encountered a problem when looking up teams", "email="+email+", "+err.Error()) } for _, team := range data { |