summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings/user_settings_advanced.jsx
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/components/user_settings/user_settings_advanced.jsx
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/components/user_settings/user_settings_advanced.jsx')
-rw-r--r--webapp/components/user_settings/user_settings_advanced.jsx6
1 files changed, 3 insertions, 3 deletions
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)}