diff options
author | Pat Lathem <patl@codero.com> | 2015-10-30 12:41:51 -0500 |
---|---|---|
committer | Pat Lathem <patl@codero.com> | 2015-10-30 12:41:51 -0500 |
commit | e6826c4d213cf33236ab1ee1d3bde96baf60a09a (patch) | |
tree | 245cc5b183d52438bd0057883219c2965e1e46f6 /store/sql_channel_store.go | |
parent | 84faccb7b74dba773cd72e2d0cebdd5bf6a34566 (diff) | |
download | chat-e6826c4d213cf33236ab1ee1d3bde96baf60a09a.tar.gz chat-e6826c4d213cf33236ab1ee1d3bde96baf60a09a.tar.bz2 chat-e6826c4d213cf33236ab1ee1d3bde96baf60a09a.zip |
Fix spelling of encountered
Diffstat (limited to 'store/sql_channel_store.go')
-rw-r--r-- | store/sql_channel_store.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 14896c0a0..2d62b8614 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -247,7 +247,7 @@ func (s SqlChannelStore) Update(channel *model.Channel) StoreChannel { result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle already exists", "id="+channel.Id+", "+err.Error()) } } else { - result.Err = model.NewAppError("SqlChannelStore.Update", "We encounted an error updating the channel", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "We encountered an error updating the channel", "id="+channel.Id+", "+err.Error()) } } else if count != 1 { result.Err = model.NewAppError("SqlChannelStore.Update", "We couldn't update the channel", "id="+channel.Id) @@ -297,7 +297,7 @@ func (s SqlChannelStore) Get(id string) StoreChannel { result := StoreResult{} if obj, err := s.GetReplica().Get(model.Channel{}, id); err != nil { - result.Err = model.NewAppError("SqlChannelStore.Get", "We encounted an error finding the channel", "id="+id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Get", "We encountered an error finding the channel", "id="+id+", "+err.Error()) } else if obj == nil { result.Err = model.NewAppError("SqlChannelStore.Get", "We couldn't find the existing channel", "id="+id) } else { @@ -537,7 +537,7 @@ func (s SqlChannelStore) UpdateMember(member *model.ChannelMember) StoreChannel } if _, err := s.GetMaster().Update(member); err != nil { - result.Err = model.NewAppError("SqlChannelStore.UpdateMember", "We encounted an error updating the channel member", + result.Err = model.NewAppError("SqlChannelStore.UpdateMember", "We encountered an error updating the channel member", "channel_id="+member.ChannelId+", "+"user_id="+member.UserId+", "+err.Error()) } else { result.Data = member |