summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-04-28 10:56:19 -0400
committerChristopher Speller <crspeller@gmail.com>2016-04-28 10:56:19 -0400
commit383cddd3d14107fabea28e09f5f9401623cd19d5 (patch)
treef0aedc438756bf41aa29aa5f3518e83f40e95da1 /i18n
parent3dbb5ab4cca74de7d7a00909927e1f034949052d (diff)
downloadchat-383cddd3d14107fabea28e09f5f9401623cd19d5.tar.gz
chat-383cddd3d14107fabea28e09f5f9401623cd19d5.tar.bz2
chat-383cddd3d14107fabea28e09f5f9401623cd19d5.zip
Don't return error if already part of channel being joined (#2814)
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 4b67d8c78..e8e20a12a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2852,6 +2852,10 @@
"translation": "We couldn't get all the channels"
},
{
+ "id": "store.sql_channel.get_member.missing.app_error",
+ "translation": "No channel member found for that user id and channel id"
+ },
+ {
"id": "store.sql_channel.get_member.app_error",
"translation": "We couldn't get the channel member"
},