коммит произвёл
GitHub
родитель
33c1609aa4
Коммит
3b081bda08
@@ -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
|
||||
|
||||
@@ -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 = (
|
||||
|
||||
@@ -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>
|
||||
);
|
||||
|
||||
Ссылка в новой задаче
Block a user