From 88f398ffddbcbb58265d085c09cb72008be3f3d5 Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Tue, 1 Aug 2017 20:16:45 +0800
Subject: Revert " #4755 Combining consecutive user join/leave system messages
 to single message and few other changes." (#7072)

* Revert "PLT-6603: Don't return all posts on invalid query. (#7061)"

This reverts commit 25a2013890c7e07b4621fa9b18342e7f35363049.

* Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes. (#5945)"

This reverts commit 8a91235fb3cdc8d094dbc2eaa0d7baa447132b3c.
---
 i18n/en.json | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index 01bde8f12..c4940295b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -153,7 +153,7 @@
   },
   {
     "id": "api.channel.add_member.added",
-    "translation": "%v added %v to the channel."
+    "translation": "%v added to the channel by %v"
   },
   {
     "id": "api.channel.add_member.find_channel.app_error",
@@ -297,7 +297,7 @@
   },
   {
     "id": "api.channel.join_channel.post_and_forget",
-    "translation": "%v joined the channel."
+    "translation": "%v has joined the channel."
   },
   {
     "id": "api.channel.leave.default.app_error",
@@ -313,7 +313,7 @@
   },
   {
     "id": "api.channel.leave.left",
-    "translation": "%v left the channel."
+    "translation": "%v has left the channel."
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
@@ -347,14 +347,6 @@
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_to",
     "translation": "%s updated the channel header to: %s"
   },
-  {
-    "id": "api.channel.create_user_activity_post.error",
-    "translation": "Failed to create user activity system message like add, remove, join or leave"
-  },
-  {
-    "id": "api.channel.update_user_activity_post.error",
-    "translation": "Failed to update user activity system message like add, remove, join or leave"
-  },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
     "translation": "Failed to post join/leave message"
-- 
cgit v1.2.3-1-g7c22