From 97558f6a6ec4c53fa69035fb430ead209d9c222d Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Fri, 13 Jan 2017 13:53:37 -0500
Subject: PLT-4938 Add app package and move logic over from api package (#4931)

* Add app package and move logic over from api package

* Change app package functions to return errors

* Move non-api tests into app package

* Fix merge
---
 i18n/en.json | 54 +++++++++++++-----------------------------------------
 1 file changed, 13 insertions(+), 41 deletions(-)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index 520195812..84ebd2748 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -805,7 +805,15 @@
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "Invalid session token=%v, err=%v"
+    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
+  },
+  {
+    "id": "api.context.invalid_session.error",
+    "translation": "Invalid session err=%v"
+  },
+  {
+    "id": "api.websocket.invalid_session.error",
+    "translation": "Invalid session err=%v"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1467,26 +1475,10 @@
     "id": "api.post.get_post.permissions.app_error",
     "translation": "You do not have the appropriate permissions"
   },
-  {
-    "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"
-  },
-  {
-    "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "Encountered error getting user, user_id=%s, err=%v"
-  },
   {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
     "translation": "Failed to create response post, err=%v"
@@ -1495,17 +1487,13 @@
     "id": "api.post.handle_webhook_events_and_forget.event_post.error",
     "translation": "Event POST failed, err=%s"
   },
-  {
-    "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "Encountered error getting webhooks by team, err=%v"
-  },
   {
     "id": "api.post.init.debug",
     "translation": "Initializing post API routes"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
-    "translation": "Failed to get 2 members for a direct channel channel_id=%v"
+    "translation": "Failed to get 2 members for a direct channel channel_id={{.ChannelId}}"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_members.error",
@@ -1519,10 +1507,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.notification.here.warn",
-    "translation": "Unable to send notification to online users with @here, err=%v"
-  },
   {
     "id": "api.post.notification.member_profile.warn",
     "translation": "Unable to get profile for channel member, user_id=%v"
@@ -1531,10 +1515,6 @@
     "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
     "translation": "Clearing push notification to %v with channel_id %v"
   },
-  {
-    "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "Failed to retrieve comment thread posts in notifications root_post_id=%v, err=%v"
-  },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
     "translation": "Failed to get files for post notification post_id=%v, err=%v"
@@ -1581,23 +1561,15 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Failed to send push device_id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "Failed to send mention email successfully email=%v err=%v"
+    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
     "translation": "{{.Prefix}} {{.Filenames}} sent"
   },
   {
-    "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "Failed to retrieve sessions in notifications id=%v, err=%v"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "Post user_id not returned by GetProfiles user_id=%v"
+    "id": "api.post.send_notifications.user_id.debug",
+    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
   },
   {
     "id": "api.post.update_mention_count_and_forget.update_error",
-- 
cgit v1.2.3-1-g7c22