Merge pull request #2064 from hmhealey/plt882

PLT-882 Ephemeral Messages and Out-Of-Channel mentions

2 files changed, 30 insertions, 18 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 74a873204..c3484d76a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -676,6 +676,14 @@
     "translation": "Error getting access token from DB before deletion"
   },
   {
+    "id": "api.post.check_for_out_of_channel_mentions.message.one",
+    "translation": "{{.Username}} was mentioned, but they do not belong to this channel."
+  },
+  {
+    "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
+    "translation": "{{.Usernames}} and {{.LastUsername}} were mentioned, but they do not belong to this channel."
+  },
+  {
     "id": "api.post.create_post.bad_filename.error",
     "translation": "Bad filename discarded, filename=%v"
   },
@@ -704,6 +712,10 @@
     "translation": "You do not have the appropriate permissions"
   },
   {
+    "id": "api.post.get_out_of_channel_mentions.regex.error",
+    "translation": "Failed to compile @mention regex user_id=%v, err=%v"
+  },
+  {
     "id": "api.post.get_post.permissions.app_error",
     "translation": "You do not have the appropriate permissions"
   },
@@ -712,6 +724,14 @@
     "translation": "Encountered error getting channel, channel_id=%s, err=%v"
   },
   {
+    "id": "api.post.handle_post_events_and_forget.members.error",
+    "translation": "Failed to get channel members channel_id=%v err=%v"
+  },
+  {
+    "id": "api.post.handle_post_events_and_forget.profiles.error",
+    "translation": "Failed to retrieve user profiles team_id=%v, err=%v"
+  },
+  {
     "id": "api.post.handle_post_events_and_forget.team.error",
     "translation": "Encountered error getting team, team_id=%s, err=%v"
   },
@@ -752,10 +772,6 @@
     "translation": "Failed to update direct channel preference user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.members.error",
-    "translation": "Failed to get channel members channel_id=%v err=%v"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_body",
     "translation": "You have one new mention."
   },
@@ -788,10 +804,6 @@
     "translation": "Failed to send push notificationid=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.retrive_profiles.error",
-    "translation": "Failed to retrieve user profiles team_id=%v, err=%v"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.send.error",
     "translation": "Failed to send mention email successfully email=%v err=%v"
   },
@@ -3531,4 +3543,4 @@
     "id": "web.watcher_fail.error",
     "translation": "Failed to add directory to watcher %v"
   }
-]
\ No newline at end of file
+]
diff --git a/i18n/es.json b/i18n/es.json
index 2fe02b2b0..8c150ba3b 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -712,6 +712,14 @@
     "translation": "Se encontró un error obteniendo el canal, channel_id=%s, err=%v"
   },
   {
+    "id": "api.post.handle_post_events_and_forget.members.error",
+    "translation": "Falla al obtener los miembros del canal channel_id=%v err=%v"
+  },
+  {
+    "id": "api.post.handle_post_events_and_forget.profiles.error",
+    "translation": "Falla al recuperar los perfiles de usuario team_id=%v, err=%v"
+  },
+  {
     "id": "api.post.handle_post_events_and_forget.team.error",
     "translation": "Se encontró un error obteniendo el equipo, team_id=%s, err=%v"
   },
@@ -752,10 +760,6 @@
     "translation": "Falla al actualizar las preferencias del canal directo user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.members.error",
-    "translation": "Falla al obtener los miembros del canal channel_id=%v err=%v"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_body",
     "translation": "Tienes una mención nueva."
   },
@@ -788,10 +792,6 @@
     "translation": "Falló el envio de la notificación push notificationid=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.retrive_profiles.error",
-    "translation": "Falla al recuperar los perfiles de usuario team_id=%v, err=%v"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.send.error",
     "translation": "Falla al enviar el correo con la mención satisfactoriamente email=%v err=%v"
   },
@@ -3531,4 +3531,4 @@
     "id": "web.watcher_fail.error",
     "translation": "Falla al agregar el directorio a ser vigilado %v"
   }
-]
\ No newline at end of file
+]