From c3d02100a9ceb0036e8be4a2d9bee1537f3bbbd7 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Wed, 14 Dec 2016 11:31:00 -0500
Subject: PLT-4903 	Rendered a placeholder for user reactions where the
 user hasn't been loaded (#4784)

* Rendered a placeholder for user reactions where the user hasn't been loaded

* Added id to reaction Tooltip

* Removed FormattedHTMLMessage from Reaction and improved support for different verb conjugations
---
 webapp/i18n/en.json | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'webapp/i18n/en.json')

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index d0945ff54..896875bda 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1643,8 +1643,14 @@
   "posts_view.newMsgBelow": "{count} new {count, plural, one {message} other {messages}} below",
   "reaction.clickToAdd": "(click to add)",
   "reaction.clickToRemove": "(click to remove)",
-  "reaction.multipleReacted": "<b>{users} and {lastUser}</b> reacted with <b>:{emojiName}:</b>",
-  "reaction.oneReacted": "<b>{user}</b> reacted with <b>:{emojiName}:</b>",
+  "reaction.reacted": "{users} {reactionVerb} with {emoji}",
+  "reaction.reactionVerb.you": "reacted",
+  "reaction.reactionVerb.user": "reacted",
+  "reaction.reactionVerb.users": "reacted",
+  "reaction.reactionVerb.youAndUsers": "reacted",
+  "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}",
+  "reaction.usersReacted": "{users} and {lastUser}",
+  "reaction.usersAndOthersReacted": "{users} and {otherUsers, number} other {otherUsers, plural, one {user} other {users}}",
   "reaction.you": "You",
   "removed_channel.channelName": "the channel",
   "removed_channel.from": "Removed from ",
-- 
cgit v1.2.3-1-g7c22