summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Gathoye <william@gathoye.be>2016-09-12 14:43:57 +0200
committerHarrison Healey <harrisonmhealey@gmail.com>2016-09-12 08:43:57 -0400
commite557f42673b758435d4df2c5abab16b8fc9d8e76 (patch)
tree22609b98a0bc3dbec65058bee0bf4dcf41653dc1
parent672749b0ea9db636efbd418758f8f8fd22870543 (diff)
downloadchat-e557f42673b758435d4df2c5abab16b8fc9d8e76.tar.gz
chat-e557f42673b758435d4df2c5abab16b8fc9d8e76.tar.bz2
chat-e557f42673b758435d4df2c5abab16b8fc9d8e76.zip
Let's be consistent with keyboard shortcuts. (#4005)
* Let's be consistent with keyboard shortcuts. * Update en.json
-rw-r--r--webapp/components/help/components/composing.jsx2
-rw-r--r--webapp/i18n/en.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/help/components/composing.jsx b/webapp/components/help/components/composing.jsx
index 398580ffa..9092027b7 100644
--- a/webapp/components/help/components/composing.jsx
+++ b/webapp/components/help/components/composing.jsx
@@ -15,7 +15,7 @@ export default class HelpComposing extends React.Component {
message.push(localizeMessage('help.composing.types', '## Message Types\nReply to posts to keep conversations organized in threads.'));
message.push(localizeMessage('help.composing.posts', '#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.'));
message.push(localizeMessage('help.composing.replies', '#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.'));
- message.push(localizeMessage('help.composing.posting', '## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **Ctrl+Enter** go to **Main Menu > Account Settings > Send messages on Ctrl + Enter**.'));
+ message.push(localizeMessage('help.composing.posting', '## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **Ctrl + ENTER** go to **Main Menu > Account Settings > Send messages on Ctrl + ENTER**.'));
message.push(localizeMessage('help.composing.editing', '## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.'));
message.push(localizeMessage('help.composing.deleting', '## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.'));
message.push(localizeMessage('help.composing.linking', '## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text > **Permalink** > **Copy Link**.'));
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 45afbd184..4f2987904 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1230,7 +1230,7 @@
"help.composing.deleting": "## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.",
"help.composing.editing": "## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.",
"help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text > **Permalink** > **Copy Link**.",
- "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **CTRL+ENTER** go to **Main Menu > Account Settings > Send messages on CTRL + ENTER**.",
+ "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **CTRL + ENTER** go to **Main Menu > Account Settings > Send messages on CTRL + ENTER**.",
"help.composing.posts": "#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.",
"help.composing.replies": "#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.",
"help.composing.title": "# Sending Messages\n_____",