Add help text for 'Words that trigger mentions' (#5459)

Этот коммит содержится в:
joannekoong
2017-02-20 19:07:50 -05:00
коммит произвёл Joram Wilander
родитель 1f8a11469d
Коммит 7068307a1c
2 изменённых файлов: 15 добавлений и 1 удалений

Просмотреть файл

@@ -608,6 +608,18 @@ export default class NotificationsTab extends React.Component {
</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 = (
<SettingItemMax
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}
server_error={serverError}
updateSection={this.handleCancel}
extraInfo={extraInfo}
/>
);
} else {
let keys = [];
let keys = ['@' + user.username];
if (this.state.firstNameKey) {
keys.push(user.first_name);
}

Просмотреть файл

@@ -2128,6 +2128,7 @@
"user.settings.notifications.emailNotifications": "Email 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.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.noWords": "No words configured",
"user.settings.notifications.off": "Off",