summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-07-21 10:00:09 -0400
committerGitHub <noreply@github.com>2016-07-21 10:00:09 -0400
commitbfa04c0ab0eca5d812ad64e5f51e95ec458cf0d3 (patch)
tree6a51f8d4d144a181192499f5fd60ef82700e9abb /i18n
parentf0e9ec2dd127ffe34472c617f978173a8bf60b7c (diff)
downloadchat-bfa04c0ab0eca5d812ad64e5f51e95ec458cf0d3.tar.gz
chat-bfa04c0ab0eca5d812ad64e5f51e95ec458cf0d3.tar.bz2
chat-bfa04c0ab0eca5d812ad64e5f51e95ec458cf0d3.zip
PLT-2408 Adds here mention for online users (#3619)
* Added @here mention that notifies online users * Fixed existing race condition that would sometime cause clients to miss mention count changes * Added missing localization strings * Prevent @here from mentioning the user who posted it
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json10
1 files changed, 9 insertions, 1 deletions
diff --git a/i18n/en.json b/i18n/en.json
index e735f6dc0..426b1ec1b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -928,6 +928,10 @@
"translation": "{{.Username}} was mentioned, but they did not receive a notification because they do not belong to this channel."
},
{
+ "id": "api.post.notification.here.warn",
+ "translation": "Unable to send notification to online users with @here, err=%v"
+ },
+ {
"id": "api.post.create_post.bad_filename.error",
"translation": "Bad filename discarded, filename=%v"
},
@@ -1077,7 +1081,7 @@
},
{
"id": "api.post.update_mention_count_and_forget.update_error",
- "translation": "Failed to update mention count for user_id=%v on channel_id=%v err=%v"
+ "translation": "Failed to update mention count, post_id=%v channel_id=%v err=%v"
},
{
"id": "api.post.update_post.find.app_error",
@@ -3904,6 +3908,10 @@
"translation": "Encountered an error retrieving all the online/away statuses"
},
{
+ "id": "store.sql_status.get_online.app_error",
+ "translation": "Encountered an error retrieving all the online statuses"
+ },
+ {
"id": "store.sql_status.get_total_active_users_count.app_error",
"translation": "We could not count the active users"
},