Add help text for 'Words that trigger mentions' (#5459)
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
1f8a11469d
Коммит
7068307a1c
@@ -608,6 +608,18 @@ export default class NotificationsTab extends React.Component {
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const extraInfo = (
|
||||||
|
<span>
|
||||||
|
<FormattedMessage
|
||||||
|
id='user.settings.notifications.mentionsInfo'
|
||||||
|
defaultMessage='Mentions trigger when someone sends a message that includes your username (@{username}) or any of the options selected above.'
|
||||||
|
values={{
|
||||||
|
username: user.username
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
|
||||||
keysSection = (
|
keysSection = (
|
||||||
<SettingItemMax
|
<SettingItemMax
|
||||||
title={Utils.localizeMessage('user.settings.notifications.wordsTrigger', 'Words that trigger mentions')}
|
title={Utils.localizeMessage('user.settings.notifications.wordsTrigger', 'Words that trigger mentions')}
|
||||||
@@ -615,10 +627,11 @@ export default class NotificationsTab extends React.Component {
|
|||||||
submit={this.handleSubmit}
|
submit={this.handleSubmit}
|
||||||
server_error={serverError}
|
server_error={serverError}
|
||||||
updateSection={this.handleCancel}
|
updateSection={this.handleCancel}
|
||||||
|
extraInfo={extraInfo}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
let keys = [];
|
let keys = ['@' + user.username];
|
||||||
if (this.state.firstNameKey) {
|
if (this.state.firstNameKey) {
|
||||||
keys.push(user.first_name);
|
keys.push(user.first_name);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2128,6 +2128,7 @@
|
|||||||
"user.settings.notifications.emailNotifications": "Email notifications",
|
"user.settings.notifications.emailNotifications": "Email notifications",
|
||||||
"user.settings.notifications.header": "Notifications",
|
"user.settings.notifications.header": "Notifications",
|
||||||
"user.settings.notifications.info": "Desktop notifications are available on Edge, Firefox, Safari, Chrome and Mattermost Desktop Apps.",
|
"user.settings.notifications.info": "Desktop notifications are available on Edge, Firefox, Safari, Chrome and Mattermost Desktop Apps.",
|
||||||
|
"user.settings.notifications.mentionsInfo": "Mentions trigger when someone sends a message that includes your username (\"@{username}\") or any of the options selected above.",
|
||||||
"user.settings.notifications.never": "Never",
|
"user.settings.notifications.never": "Never",
|
||||||
"user.settings.notifications.noWords": "No words configured",
|
"user.settings.notifications.noWords": "No words configured",
|
||||||
"user.settings.notifications.off": "Off",
|
"user.settings.notifications.off": "Off",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user