summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2017-03-20 08:51:25 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-03-20 08:51:25 -0400
commit4efefa0ff6a49491ea33ca7fd5c9efd2422b0fe1 (patch)
tree414758ee44d50d957032be61c895057aabbea3bf /webapp
parent7e89077a93fd187284e426db503a4ab5cbcdf248 (diff)
downloadchat-4efefa0ff6a49491ea33ca7fd5c9efd2422b0fe1.tar.gz
chat-4efefa0ff6a49491ea33ca7fd5c9efd2422b0fe1.tar.bz2
chat-4efefa0ff6a49491ea33ca7fd5c9efd2422b0fe1.zip
Update pinned posts help text (#5811)
* Update pinned posts help text * Update en.json * Fix id
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/search_results.jsx10
-rwxr-xr-xwebapp/i18n/en.json5
2 files changed, 11 insertions, 4 deletions
diff --git a/webapp/components/search_results.jsx b/webapp/components/search_results.jsx
index ceafd766c..ce72ec3b1 100644
--- a/webapp/components/search_results.jsx
+++ b/webapp/components/search_results.jsx
@@ -226,13 +226,19 @@ export default class SearchResults extends React.Component {
<li>
<FormattedHTMLMessage
id='search_results.usagePin2'
- defaultMessage={'You can pin a message by clicking the "Pin to channel" option from the message\'s menu.'}
+ defaultMessage='All members of this channel can pin important or useful messages.'
/>
</li>
<li>
<FormattedHTMLMessage
id='search_results.usagePin3'
- defaultMessage='Pinned messages are accessible by all channel members and are a way to mark messages for future reference.'
+ defaultMessage='Pinned messages are visible to all channel members.'
+ />
+ </li>
+ <li>
+ <FormattedHTMLMessage
+ id='search_results.usagePin4'
+ defaultMessage={'To pin a message: Go to the message that you want to pin and click [...] > "Pin to channel".'}
/>
</li>
</ul>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 85974b721..08497a42f 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1796,8 +1796,9 @@
"search_results.usageFlag3": " icon next to the timestamp.",
"search_results.usageFlag4": "Flags are a way to mark messages for follow up. Your flags are personal, and cannot be seen by other users.",
"search_results.usagePin1": "There are no pinned messages yet.",
- "search_results.usagePin2": "You can pin a message by clicking the \"Pin to channel\" option from the message's menu.",
- "search_results.usagePin3": "Pinned messages are accessible by all channel members and are a way to mark messages for future reference.",
+ "search_results.usagePin2": "All members of this channel can pin important or useful messages.",
+ "search_results.usagePin3": "Pinned messages are visible to all channel members.",
+ "search_results.usagePin4": "To pin a message: Go to the message that you want to pin and click [...] > \"Pin to channel\".",
"setting_item_max.cancel": "Cancel",
"setting_item_max.save": "Save",
"setting_item_min.edit": "Edit",