From 257f74873297a6c6b4d14f2d21ffc3adad620c4c Mon Sep 17 00:00:00 2001
From: Christian Claus <ch.claus@me.com>
Date: Wed, 28 Mar 2018 06:02:04 +0200
Subject: [PLT-4340] Channel Mute and "/mute" command #7617 (#7713)

* Add command and store changes to allow mute toggling

* Change channel muting to use ChannelMember notification structure

* Suppress email and push notifications for a muted channel

* Make i18n keys issue-compliant

* Add notification-cache handling for channel-muting

* Add channel handle for channel-muting slash-command

* Add unit test for mute command

* Merge branch 'master' into PLT-4340

# Conflicts:
#	app/notification.go

* Fix issue that command_mute responses will be overwritten

* Fix i18n key for channel muting

* Apply new Provider Interface to MuteCommand

* Migrate mute notification property to mark_unread

PLT-4340

* Make some i18n improvements for command_mute

PLT-4340

* Remove de.json translations

* Prevent push notifications when channel is muted

* Treat Group messages like Direct messages

* Fix unit test

* Send WS event when the channel member notify props changed
---
 i18n/en.json | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index cf3e88b5a..6b387404b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1014,6 +1014,38 @@
     "id": "api.command_shrug.name",
     "translation": "shrug"
   },
+  {
+    "id": "api.command_mute.desc",
+    "translation": "Turns off desktop, email and push notifications for the current channel or the [channel] specified."
+  },
+  {
+    "id": "api.command_mute.hint",
+    "translation": "[channel]"
+  },
+  {
+    "id": "api.command_mute.name",
+    "translation": "mute"
+  },
+  {
+    "id": "api.command_mute.error",
+    "translation": "Could not find the channel {{.Channel}}."
+  },
+  {
+    "id": "api.command_mute.success_mute",
+    "translation": "You will not receive notifications for {{.Channel}} until channel mute is turned off."
+  },
+  {
+    "id": "api.command_mute.success_unmute",
+    "translation": "{{.Channel}} is no longer muted."
+  },
+  {
+    "id": "api.command_mute.success_mute_direct_msg",
+    "translation": "You will not receive notifications for this channel until channel mute is turned off."
+  },
+  {
+    "id": "api.command_mute.success_unmute_direct_msg",
+    "translation": "This channel is no longer muted."
+  },
   {
     "id": "api.compliance.init.debug",
     "translation": "Initializing compliance API routes"
@@ -4570,6 +4602,10 @@
     "id": "model.channel_member.is_valid.email_value.app_error",
     "translation": "Invalid email notification value"
   },
+  {
+    "id": "model.channel_member.is_valid.mute_value.app_error",
+    "translation": "Invalid muting value"
+  },
   {
     "id": "model.channel_member.is_valid.notify_level.app_error",
     "translation": "Invalid notify level"
-- 
cgit v1.2.3-1-g7c22