Update text in Account Settings > Notification (#3901)
* Comment thread notification text * Update user_settings_notifications.jsx * Update user_settings_notifications.jsx * Update en.json * Update email_notification_setting.jsx * Update en.json * Update user_settings_notifications.jsx * Update user_settings_notifications.jsx * Update user_settings_notifications.jsx * Update user_settings_notifications.jsx
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
60a0db7f6a
Коммит
e9bc77a8f7
@@ -102,7 +102,7 @@ export default class EmailNotificationSetting extends React.Component {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<SettingItemMin
|
<SettingItemMin
|
||||||
title={localizeMessage('user.settings.notifications.emailNotifications', 'Send Email notifications')}
|
title={localizeMessage('user.settings.notifications.emailNotifications', 'Email notifications')}
|
||||||
describe={description}
|
describe={description}
|
||||||
updateSection={this.expand}
|
updateSection={this.expand}
|
||||||
/>
|
/>
|
||||||
@@ -156,7 +156,7 @@ export default class EmailNotificationSetting extends React.Component {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<SettingItemMax
|
<SettingItemMax
|
||||||
title={localizeMessage('user.settings.notifications.emailNotifications', 'Send email notifications')}
|
title={localizeMessage('user.settings.notifications.emailNotifications', 'Email notifications')}
|
||||||
inputs={[
|
inputs={[
|
||||||
<div key='userNotificationEmailOptions'>
|
<div key='userNotificationEmailOptions'>
|
||||||
<div className='radio'>
|
<div className='radio'>
|
||||||
@@ -192,7 +192,7 @@ export default class EmailNotificationSetting extends React.Component {
|
|||||||
<div>
|
<div>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='user.settings.notifications.emailInfo'
|
id='user.settings.notifications.emailInfo'
|
||||||
defaultMessage='Email notifications that are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.'
|
defaultMessage='Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.'
|
||||||
values={{
|
values={{
|
||||||
siteName: global.window.mm_config.SiteName
|
siteName: global.window.mm_config.SiteName
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -421,7 +421,7 @@ export default class NotificationsTab extends React.Component {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<SettingItemMax
|
<SettingItemMax
|
||||||
title={Utils.localizeMessage('user.settings.notifications.push', 'Send mobile push notifications')}
|
title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')}
|
||||||
extraInfo={extraInfo}
|
extraInfo={extraInfo}
|
||||||
inputs={inputs}
|
inputs={inputs}
|
||||||
submit={submit}
|
submit={submit}
|
||||||
@@ -500,7 +500,7 @@ export default class NotificationsTab extends React.Component {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<SettingItemMin
|
<SettingItemMin
|
||||||
title={Utils.localizeMessage('user.settings.notifications.push', 'Send mobile push notifications')}
|
title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')}
|
||||||
describe={describe}
|
describe={describe}
|
||||||
updateSection={handleUpdatePushSection}
|
updateSection={handleUpdatePushSection}
|
||||||
/>
|
/>
|
||||||
@@ -769,14 +769,14 @@ export default class NotificationsTab extends React.Component {
|
|||||||
<span>
|
<span>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='user.settings.notifications.commentsInfo'
|
id='user.settings.notifications.commentsInfo'
|
||||||
defaultMessage='Mode of triggering notifications on posts in comment threads you participated in.'
|
defaultMessage="In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads."
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|
||||||
commentsSection = (
|
commentsSection = (
|
||||||
<SettingItemMax
|
<SettingItemMax
|
||||||
title={Utils.localizeMessage('user.settings.notifications.comments', 'Comment threads notifications')}
|
title={Utils.localizeMessage('user.settings.notifications.comments', 'Reply notifications')}
|
||||||
extraInfo={extraInfo}
|
extraInfo={extraInfo}
|
||||||
inputs={inputs}
|
inputs={inputs}
|
||||||
submit={this.handleSubmit}
|
submit={this.handleSubmit}
|
||||||
@@ -790,21 +790,21 @@ export default class NotificationsTab extends React.Component {
|
|||||||
describe = (
|
describe = (
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='user.settings.notifications.commentsNever'
|
id='user.settings.notifications.commentsNever'
|
||||||
defaultMessage='No mentions for comments'
|
defaultMessage="Only trigger notifications when I'm mentioned"
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} else if (this.state.notifyCommentsLevel === 'root') {
|
} else if (this.state.notifyCommentsLevel === 'root') {
|
||||||
describe = (
|
describe = (
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='user.settings.notifications.commentsRoot'
|
id='user.settings.notifications.commentsRoot'
|
||||||
defaultMessage='Mention any comments on your post'
|
defaultMessage='Trigger notifications on messages in threads that I start'
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
describe = (
|
describe = (
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='user.settings.notifications.commentsAny'
|
id='user.settings.notifications.commentsAny'
|
||||||
defaultMessage='Mention any comments in a thread you participated in (This will include both mentions to your root post and any comments after you commented on a post)'
|
defaultMessage='Trigger notifications on messages in reply threads that I start or participate in'
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -815,7 +815,7 @@ export default class NotificationsTab extends React.Component {
|
|||||||
|
|
||||||
commentsSection = (
|
commentsSection = (
|
||||||
<SettingItemMin
|
<SettingItemMin
|
||||||
title={Utils.localizeMessage('user.settings.notifications.comments', 'Comment threads notifications')}
|
title={Utils.localizeMessage('user.settings.notifications.comments', 'Reply notifications')}
|
||||||
describe={describe}
|
describe={describe}
|
||||||
updateSection={handleUpdateCommentsSection}
|
updateSection={handleUpdateCommentsSection}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1859,11 +1859,11 @@
|
|||||||
"user.settings.notifications.allActivity": "For all activity",
|
"user.settings.notifications.allActivity": "For all activity",
|
||||||
"user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\", \"@all\"",
|
"user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\", \"@all\"",
|
||||||
"user.settings.notifications.close": "Close",
|
"user.settings.notifications.close": "Close",
|
||||||
"user.settings.notifications.comments": "Comment threads notifications",
|
"user.settings.notifications.comments": "Reply notifications",
|
||||||
"user.settings.notifications.commentsAny": "Mention any comments in a thread you participated in (This will include both mentions to your root post and any comments after you commented on a post)",
|
"user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in",
|
||||||
"user.settings.notifications.commentsInfo": "Mode of triggering notifications on posts in comment threads you participated in.",
|
"user.settings.notifications.commentsInfo": "In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads.",
|
||||||
"user.settings.notifications.commentsNever": "No mentions for comments",
|
"user.settings.notifications.commentsNever": "Only trigger notifications when I'm mentioned",
|
||||||
"user.settings.notifications.commentsRoot": "Mention any comments on your post",
|
"user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start",
|
||||||
"user.settings.notifications.desktop": "Send desktop notifications",
|
"user.settings.notifications.desktop": "Send desktop notifications",
|
||||||
"user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely",
|
"user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely",
|
||||||
"user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds",
|
"user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds",
|
||||||
@@ -1885,8 +1885,8 @@
|
|||||||
"user.settings.notifications.desktop.sound": "Notification sound",
|
"user.settings.notifications.desktop.sound": "Notification sound",
|
||||||
"user.settings.notifications.desktopSounds": "Desktop notification sounds",
|
"user.settings.notifications.desktopSounds": "Desktop notification sounds",
|
||||||
"user.settings.notifications.emailBatchingInfo": "Notifications are combined into a single email and sent at the maximum frequency selected here.",
|
"user.settings.notifications.emailBatchingInfo": "Notifications are combined into a single email and sent at the maximum frequency selected here.",
|
||||||
"user.settings.notifications.emailInfo": "Email notifications that are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.",
|
"user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.",
|
||||||
"user.settings.notifications.emailNotifications": "Send email notifications",
|
"user.settings.notifications.emailNotifications": "Email notifications",
|
||||||
"user.settings.notifications.everyHour": "Every hour",
|
"user.settings.notifications.everyHour": "Every hour",
|
||||||
"user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
|
"user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
|
||||||
"user.settings.notifications.header": "Notifications",
|
"user.settings.notifications.header": "Notifications",
|
||||||
@@ -1897,7 +1897,7 @@
|
|||||||
"user.settings.notifications.off": "Off",
|
"user.settings.notifications.off": "Off",
|
||||||
"user.settings.notifications.on": "On",
|
"user.settings.notifications.on": "On",
|
||||||
"user.settings.notifications.onlyMentions": "Only for mentions and direct messages",
|
"user.settings.notifications.onlyMentions": "Only for mentions and direct messages",
|
||||||
"user.settings.notifications.push": "Send mobile push notifications",
|
"user.settings.notifications.push": "Mobile push notifications",
|
||||||
"user.settings.notifications.sensitiveName": "Your case sensitive first name \"{first_name}\"",
|
"user.settings.notifications.sensitiveName": "Your case sensitive first name \"{first_name}\"",
|
||||||
"user.settings.notifications.sensitiveUsername": "Your non-case sensitive username \"{username}\"",
|
"user.settings.notifications.sensitiveUsername": "Your non-case sensitive username \"{username}\"",
|
||||||
"user.settings.notifications.sensitiveWords": "Other non-case sensitive words, separated by commas:",
|
"user.settings.notifications.sensitiveWords": "Other non-case sensitive words, separated by commas:",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user