summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-07-18 11:10:03 -0400
committerGitHub <noreply@github.com>2016-07-18 11:10:03 -0400
commitc0ab2636d699c8544ce03a58f61b95cfd66ff7ce (patch)
treec7d07934e0ff1a75aafb097a184ae150888199c0 /i18n/en.json
parent180adc79af3d14de6ce62f6e687a6735db3fe82f (diff)
downloadchat-c0ab2636d699c8544ce03a58f61b95cfd66ff7ce.tar.gz
chat-c0ab2636d699c8544ce03a58f61b95cfd66ff7ce.tar.bz2
chat-c0ab2636d699c8544ce03a58f61b95cfd66ff7ce.zip
PLT-2241 Refactored statuses into a more real-time system (#3573)
* Refactored statuses into a more real-time system * Updated package.json with correct commit and fixed minor bug * Minor updates to statuses based on feedback * When setting status online, update only LastActivityAt if status already exists
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json34
1 files changed, 29 insertions, 5 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 245ae8d83..c29059ebb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1980,12 +1980,12 @@
"translation": "Bad verify email link."
},
{
- "id": "api.web_conn.new_web_conn.last_activity.error",
+ "id": "api.status.last_activity.error",
"translation": "Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v"
},
{
- "id": "api.web_conn.new_web_conn.last_ping.error",
- "translation": "Failed to update LastPingAt for user_id=%v, err=%v"
+ "id": "api.status.save_status.error",
+ "translation": "Failed to save status for user_id=%v, err=%v"
},
{
"id": "api.web_hub.start.stopping.debug",
@@ -4036,8 +4036,32 @@
"translation": "We encountered an error while finding user profiles"
},
{
- "id": "store.sql_user.get_total_active_users_count.app_error",
- "translation": "We could not count the users"
+ "id": "store.sql_status.get_total_active_users_count.app_error",
+ "translation": "We could not count the active users"
+ },
+ {
+ "id": "store.sql_status.reset_all.app_error",
+ "translation": "Encountered an error resetting all the statuses"
+ },
+ {
+ "id": "store.sql_status.get_online_away.app_error",
+ "translation": "Encountered an error retrieving all the online/away statuses"
+ },
+ {
+ "id": "store.sql_status.get.app_error",
+ "translation": "Encountered an error retrieving the status"
+ },
+ {
+ "id": "store.sql_status.get.missing.app_error",
+ "translation": "No entry for that status exists"
+ },
+ {
+ "id": "store.sql_status.update.app_error",
+ "translation": "Encountered an error updating the status"
+ },
+ {
+ "id": "store.sql_status.save.app_error",
+ "translation": "Encountered an error saving the status"
},
{
"id": "store.sql_user.get_total_users_count.app_error",