summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/admin_console/password_settings.jsx16
-rw-r--r--webapp/components/channel_header.jsx8
-rw-r--r--webapp/components/navbar.jsx8
3 files changed, 16 insertions, 16 deletions
diff --git a/webapp/components/admin_console/password_settings.jsx b/webapp/components/admin_console/password_settings.jsx
index 3707977b8..43ec40904 100644
--- a/webapp/components/admin_console/password_settings.jsx
+++ b/webapp/components/admin_console/password_settings.jsx
@@ -39,16 +39,16 @@ export default class PasswordSettings extends AdminSettings {
if (global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.PasswordRequirements === 'true') {
let sampleErrorMsgId = 'user.settings.security.passwordError';
if (props.config.PasswordSettings.Lowercase) {
- sampleErrorMsgId = sampleErrorMsgId + 'Lowercase';
+ sampleErrorMsgId += 'Lowercase';
}
if (props.config.PasswordSettings.Uppercase) {
- sampleErrorMsgId = sampleErrorMsgId + 'Uppercase';
+ sampleErrorMsgId += 'Uppercase';
}
if (props.config.PasswordSettings.Number) {
- sampleErrorMsgId = sampleErrorMsgId + 'Number';
+ sampleErrorMsgId += 'Number';
}
if (props.config.PasswordSettings.Symbol) {
- sampleErrorMsgId = sampleErrorMsgId + 'Symbol';
+ sampleErrorMsgId += 'Symbol';
}
this.sampleErrorMsg = (
<FormattedMessage
@@ -101,16 +101,16 @@ export default class PasswordSettings extends AdminSettings {
}
let sampleErrorMsgId = 'user.settings.security.passwordError';
if (this.refs.lowercase.checked) {
- sampleErrorMsgId = sampleErrorMsgId + 'Lowercase';
+ sampleErrorMsgId += 'Lowercase';
}
if (this.refs.uppercase.checked) {
- sampleErrorMsgId = sampleErrorMsgId + 'Uppercase';
+ sampleErrorMsgId += 'Uppercase';
}
if (this.refs.number.checked) {
- sampleErrorMsgId = sampleErrorMsgId + 'Number';
+ sampleErrorMsgId += 'Number';
}
if (this.refs.symbol.checked) {
- sampleErrorMsgId = sampleErrorMsgId + 'Symbol';
+ sampleErrorMsgId += 'Symbol';
}
return (
<FormattedMessage
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx
index 556e49863..3d7ec000c 100644
--- a/webapp/components/channel_header.jsx
+++ b/webapp/components/channel_header.jsx
@@ -683,10 +683,10 @@ export default class ChannelHeader extends React.Component {
id='channelHeader.removeFromFavorites'
defaultMessage='Remove from Favorites'
/> :
- <FormattedMessage
- id='channelHeader.addToFavorites'
- defaultMessage='Add to Favorites'
- />}
+ <FormattedMessage
+ id='channelHeader.addToFavorites'
+ defaultMessage='Add to Favorites'
+ />}
</Tooltip>
);
const toggleFavorite = (
diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx
index 1ad2f916d..28d8fae05 100644
--- a/webapp/components/navbar.jsx
+++ b/webapp/components/navbar.jsx
@@ -554,10 +554,10 @@ export default class Navbar extends React.Component {
id='channelHeader.removeFromFavorites'
defaultMessage='Remove from Favorites'
/> :
- <FormattedMessage
- id='channelHeader.addToFavorites'
- defaultMessage='Add to Favorites'
- />}
+ <FormattedMessage
+ id='channelHeader.addToFavorites'
+ defaultMessage='Add to Favorites'
+ />}
</a>
</li>
);