summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2017-03-02 08:38:56 -0500
committerJoram Wilander <jwawilander@gmail.com>2017-03-02 08:38:56 -0500
commitea10b63ae41afe748e256d0ffb5c3e003a04d625 (patch)
tree0b1f9a714544097fa768e11449624db04ef05e25 /webapp
parent4fb71d8d6cde37edfbb943d41e0a4a23784ae7f5 (diff)
downloadchat-ea10b63ae41afe748e256d0ffb5c3e003a04d625.tar.gz
chat-ea10b63ae41afe748e256d0ffb5c3e003a04d625.tar.bz2
chat-ea10b63ae41afe748e256d0ffb5c3e003a04d625.zip
Update UI text for shortcuts to follow text formatting guidelines (#5533)
* Update en.json * Update user_settings_advanced.jsx * Update messaging.jsx * Update composing.jsx * Fix formatting error with double quotes
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/help/components/composing.jsx2
-rw-r--r--webapp/components/help/components/messaging.jsx2
-rw-r--r--webapp/components/user_settings/user_settings_advanced.jsx6
-rw-r--r--webapp/i18n/en.json8
4 files changed, 9 insertions, 9 deletions
diff --git a/webapp/components/help/components/composing.jsx b/webapp/components/help/components/composing.jsx
index ca2476c12..e7b4a9e04 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/components/help/components/messaging.jsx b/webapp/components/help/components/messaging.jsx
index bbd3e2fb7..dd1c90f8b 100644
--- a/webapp/components/help/components/messaging.jsx
+++ b/webapp/components/help/components/messaging.jsx
@@ -12,7 +12,7 @@ export default class HelpMessaging extends React.Component {
render() {
const message = [];
message.push(localizeMessage('help.messaging.title', '# Messaging Basics\n_____'));
- message.push(localizeMessage('help.messaging.write', '**Write messages** using the text input box at the bottom of Mattermost. Press **ENTER** to send a message. Use **Shift+ENTER** to create a new line without sending a message.'));
+ message.push(localizeMessage('help.messaging.write', '**Write messages** using the text input box at the bottom of Mattermost. Press ENTER to send a message. Use SHIFT+ENTER to create a new line without sending a message.'));
message.push(localizeMessage('help.messaging.reply', '**Reply to messages** by clicking the reply arrow next to the message text.'));
message.push('![reply arrow](https://docs.mattermost.com/_images/replyIcon.PNG)');
message.push(localizeMessage('help.messaging.notify', '**Notify teammates** when they are needed by typing `@username`.'));
diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx
index dc6f4ac0c..6e3d488e1 100644
--- a/webapp/components/user_settings/user_settings_advanced.jsx
+++ b/webapp/components/user_settings/user_settings_advanced.jsx
@@ -393,7 +393,7 @@ export default class AdvancedSettingsDisplay extends React.Component {
<br/>
<FormattedMessage
id='user.settings.advance.sendDesc'
- defaultMessage="If enabled 'Enter' inserts a new line and 'Ctrl + Enter' submits the message."
+ defaultMessage='If enabled ENTER inserts a new line and CTRL+ENTER submits the message.'
/>
</div>
</div>
@@ -403,7 +403,7 @@ export default class AdvancedSettingsDisplay extends React.Component {
title={
<FormattedMessage
id='user.settings.advance.sendTitle'
- defaultMessage='Send messages on Ctrl + Enter'
+ defaultMessage='Send messages on CTRL+ENTER'
/>
}
inputs={inputs}
@@ -421,7 +421,7 @@ export default class AdvancedSettingsDisplay extends React.Component {
title={
<FormattedMessage
id='user.settings.advance.sendTitle'
- defaultMessage='Send messages on Ctrl + Enter'
+ defaultMessage='Send messages on CTRL+ENTER'
/>
}
describe={this.renderOnOffLabel(this.state.settings.send_on_ctrl_enter)}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index cb4700315..48c27df38 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1385,7 +1385,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 sidebar 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_____",
@@ -1449,7 +1449,7 @@
"help.messaging.notify": "**Notify teammates** when they are needed by typing `@username`.",
"help.messaging.reply": "**Reply to messages** by clicking the reply arrow next to the message text.",
"help.messaging.title": "# Messaging Basics\n_____",
- "help.messaging.write": "**Write messages** using the text input box at the bottom of Mattermost. Press **ENTER** to send a message. Use **Shift+ENTER** to create a new line without sending a message.",
+ "help.messaging.write": "**Write messages** using the text input box at the bottom of Mattermost. Press ENTER to send a message. Use SHIFT+ENTER to create a new line without sending a message.",
"installed_command.header": "Slash Commands",
"installed_commands.add": "Add Slash Command",
"installed_commands.empty": "No commands found",
@@ -1956,8 +1956,8 @@
"user.settings.advance.on": "On",
"user.settings.advance.preReleaseDesc": "Check any pre-released features you'd like to preview. You may also need to refresh the page before the setting will take effect.",
"user.settings.advance.preReleaseTitle": "Preview pre-release features",
- "user.settings.advance.sendDesc": "If enabled 'ENTER' inserts a new line and 'CTRL + ENTER' submits the message.",
- "user.settings.advance.sendTitle": "Send messages on CTRL + ENTER",
+ "user.settings.advance.sendDesc": "If enabled ENTER inserts a new line and CTRL+ENTER submits the message.",
+ "user.settings.advance.sendTitle": "Send messages on CTRL+ENTER",
"user.settings.advance.slashCmd_autocmp": "Enable external application to offer slash command autocomplete",
"user.settings.advance.title": "Advanced Settings",
"user.settings.advance.webrtc_preview": "Enable the ability to make and receive one-on-one WebRTC calls",