From 994358c31a93296a225f7d34942bbedfeac025c4 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Wed, 3 Feb 2016 10:56:47 -0500
Subject: Reworked the code for sending notifications and checking for out of
 channel mentions to share some data

---
 i18n/en.json | 24 ++++++++----------------
 i18n/es.json | 24 ++++++++----------------
 2 files changed, 16 insertions(+), 32 deletions(-)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index 8ffbc8b14..12d53022e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -691,14 +691,6 @@
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "You do not have the appropriate permissions"
   },
-  {
-    "id": "api.post.get_out_of_channel_mentions.retrieve_members.error",
-    "translation": "Failed to get channel members channel_id=%v err=%v"
-  },
-  {
-    "id": "api.post.get_out_of_channel_mentions.retrieve_profiles.error",
-    "translation": "Failed to retrieve user profiles team_id=%v, err=%v"
-  },
   {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
     "translation": "Failed to compile @mention regex user_id=%v, err=%v"
@@ -711,6 +703,14 @@
     "id": "api.post.handle_post_events_and_forget.channel.error",
     "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"
@@ -751,10 +751,6 @@
     "id": "api.post.make_direct_channel_visible.update_pref.error",
     "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."
@@ -787,10 +783,6 @@
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "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"
diff --git a/i18n/es.json b/i18n/es.json
index 50adbe092..6b1f18d92 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -683,14 +683,6 @@
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "No tienes los permisos apropiados"
   },
-  {
-    "id": "api.post.get_out_of_channel_mentions.retrieve_members.error",
-    "translation": "Falla al obtener los miembros del canal channel_id=%v err=%v"
-  },
-  {
-    "id": "api.post.get_out_of_channel_mentions.retrieve_profiles.error",
-    "translation": "Falla al recuperar los perfiles de usuario team_id=%v, err=%v"
-  },
   {
     "id": "api.post.get_post.permissions.app_error",
     "translation": "No tienes los permisos apropiados"
@@ -699,6 +691,14 @@
     "id": "api.post.handle_post_events_and_forget.channel.error",
     "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"
@@ -739,10 +739,6 @@
     "id": "api.post.make_direct_channel_visible.update_pref.error",
     "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."
@@ -775,10 +771,6 @@
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "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"
-- 
cgit v1.2.3-1-g7c22