mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

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
Этот коммит содержится в:
Eric Sethna
2016-08-30 17:41:37 -06:00
коммит произвёл Joram Wilander
родитель 60a0db7f6a
Коммит e9bc77a8f7
3 изменённых файлов: 20 добавлений и 20 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
webapp/components/user_settings/email_notification_setting.jsx
Просмотреть файл

@@ -102,7 +102,7 @@ export default class EmailNotificationSetting extends React.Component {
return (
<SettingItemMin
title={localizeMessage('user.settings.notifications.emailNotifications', 'Send Email notifications')}
title={localizeMessage('user.settings.notifications.emailNotifications', 'Email notifications')}
describe={description}
updateSection={this.expand}
/>
@@ -156,7 +156,7 @@ export default class EmailNotificationSetting extends React.Component {
return (
<SettingItemMax
title={localizeMessage('user.settings.notifications.emailNotifications', 'Send email notifications')}
title={localizeMessage('user.settings.notifications.emailNotifications', 'Email notifications')}
inputs={[
<div key='userNotificationEmailOptions'>
<div className='radio'>
@@ -192,7 +192,7 @@ export default class EmailNotificationSetting extends React.Component {
<div>
<FormattedMessage
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={{
siteName: global.window.mm_config.SiteName
}}
@@ -208,4 +208,4 @@ export default class EmailNotificationSetting extends React.Component {
/>
);
}
}
}

16
webapp/components/user_settings/user_settings_notifications.jsx
Просмотреть файл

@@ -421,7 +421,7 @@ export default class NotificationsTab extends React.Component {
return (
<SettingItemMax
title={Utils.localizeMessage('user.settings.notifications.push', 'Send mobile push notifications')}
title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')}
extraInfo={extraInfo}
inputs={inputs}
submit={submit}
@@ -500,7 +500,7 @@ export default class NotificationsTab extends React.Component {
return (
<SettingItemMin
title={Utils.localizeMessage('user.settings.notifications.push', 'Send mobile push notifications')}
title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')}
describe={describe}
updateSection={handleUpdatePushSection}
/>
@@ -769,14 +769,14 @@ export default class NotificationsTab extends React.Component {
<span>
<FormattedMessage
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>
);
commentsSection = (
<SettingItemMax
title={Utils.localizeMessage('user.settings.notifications.comments', 'Comment threads notifications')}
title={Utils.localizeMessage('user.settings.notifications.comments', 'Reply notifications')}
extraInfo={extraInfo}
inputs={inputs}
submit={this.handleSubmit}
@@ -790,21 +790,21 @@ export default class NotificationsTab extends React.Component {
describe = (
<FormattedMessage
id='user.settings.notifications.commentsNever'
defaultMessage='No mentions for comments'
defaultMessage="Only trigger notifications when I'm mentioned"
/>
);
} else if (this.state.notifyCommentsLevel === 'root') {
describe = (
<FormattedMessage
id='user.settings.notifications.commentsRoot'
defaultMessage='Mention any comments on your post'
defaultMessage='Trigger notifications on messages in threads that I start'
/>
);
} else {
describe = (
<FormattedMessage
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 = (
<SettingItemMin
title={Utils.localizeMessage('user.settings.notifications.comments', 'Comment threads notifications')}
title={Utils.localizeMessage('user.settings.notifications.comments', 'Reply notifications')}
describe={describe}
updateSection={handleUpdateCommentsSection}
/>

16
webapp/i18n/en.json
Просмотреть файл

@@ -1859,11 +1859,11 @@
"user.settings.notifications.allActivity": "For all activity",
"user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\", \"@all\"",
"user.settings.notifications.close": "Close",
"user.settings.notifications.comments": "Comment threads 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.commentsInfo": "Mode of triggering notifications on posts in comment threads you participated in.",
"user.settings.notifications.commentsNever": "No mentions for comments",
"user.settings.notifications.commentsRoot": "Mention any comments on your post",
"user.settings.notifications.comments": "Reply notifications",
"user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate 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": "Only trigger notifications when I'm mentioned",
"user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start",
"user.settings.notifications.desktop": "Send desktop notifications",
"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",
@@ -1885,8 +1885,8 @@
"user.settings.notifications.desktop.sound": "Notification sound",
"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.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.emailNotifications": "Send email notifications",
"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": "Email notifications",
"user.settings.notifications.everyHour": "Every hour",
"user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
"user.settings.notifications.header": "Notifications",
@@ -1897,7 +1897,7 @@
"user.settings.notifications.off": "Off",
"user.settings.notifications.on": "On",
"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.sensitiveUsername": "Your non-case sensitive username \"{username}\"",
"user.settings.notifications.sensitiveWords": "Other non-case sensitive words, separated by commas:",