toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MM-19896 Correct helper text on Email Notifications (#3614)

Browse source
This commit is contained in:
Elias Nahum 2019-11-28 06:23:30 -03:00 committed by Jesús Espino
parent 16c9349490
commit e8cd6dad73
9 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.android.test.js.snap
View file

@ -91,14 +91,9 @@ exports[`NotificationSettingsEmailAndroid should match snapshot 2`] = `
}
/>
<FormattedText
defaultMessage="Email notifications 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 for more than 5 minutes."
id="user.settings.notifications.emailInfo"
style={Object {}}
values={
Object {
"siteName": "Mattermost",
}
}
/>
</View>
<View

7
app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.ios.test.js.snap
View file

@ -3,13 +3,8 @@
exports[`NotificationSettingsEmailIos should match snapshot, renderEmailSection 1`] = `
<section
disableFooter={false}
footerDefaultMessage="Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes."
footerDefaultMessage="Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes."
footerId="user.settings.notifications.emailInfo"
footerValues={
Object {
"siteName": "Mattermost",
}
}
headerDefaultMessage="SEND EMAIL NOTIFICATIONS"
headerId="mobile.notification_settings.email.send"
isLandscape={false}

1
app/screens/settings/notification_settings_email/index.js
View file

@ -41,7 +41,6 @@ function mapStateToProps(state) {
enableEmailBatching,
emailInterval,
sendEmailNotifications,
siteName: config.siteName || '',
theme: getTheme(state),
isLandscape: isLandscape(state),
};

4
app/screens/settings/notification_settings_email/notification_settings_email.android.js
View file

@ -101,7 +101,6 @@ class NotificationSettingsEmailAndroid extends NotificationSettingsEmailBase {
const {
enableEmailBatching,
sendEmailNotifications,
siteName,
} = this.props;
const {newInterval} = this.state;
@ -110,8 +109,7 @@ class NotificationSettingsEmailAndroid extends NotificationSettingsEmailBase {
helpText = (
<FormattedText
id='user.settings.notifications.emailInfo'
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}}
defaultMessage='Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.'
style={style.modalHelpText}
/>
);

1
app/screens/settings/notification_settings_email/notification_settings_email.android.test.js
View file

@ -24,7 +24,6 @@ describe('NotificationSettingsEmailAndroid', () => {
savePreferences: jest.fn(),
},
sendEmailNotifications: true,
siteName: 'Mattermost',
theme: Preferences.THEMES.default,
componentId: 'component-id',
};

4
app/screens/settings/notification_settings_email/notification_settings_email.ios.js
View file

@ -24,7 +24,6 @@ class NotificationSettingsEmailIos extends NotificationSettingsEmailBase {
const {
enableEmailBatching,
sendEmailNotifications,
siteName,
theme,
isLandscape,
} = this.props;
@ -36,8 +35,7 @@ class NotificationSettingsEmailIos extends NotificationSettingsEmailBase {
headerId={t('mobile.notification_settings.email.send')}
headerDefaultMessage='SEND EMAIL NOTIFICATIONS'
footerId={t('user.settings.notifications.emailInfo')}
footerDefaultMessage='Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.'
footerValues={{siteName}}
footerDefaultMessage='Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.'
disableFooter={!sendEmailNotifications}
theme={theme}
isLandscape={isLandscape}

1
app/screens/settings/notification_settings_email/notification_settings_email.ios.test.js
View file

@ -31,7 +31,6 @@ describe('NotificationSettingsEmailIos', () => {
savePreferences: jest.fn(),
},
sendEmailNotifications: true,
siteName: 'Mattermost',
theme: Preferences.THEMES.default,
componentId: 'component-id',
isLandscape: false,

1
app/screens/settings/notification_settings_email/notification_settings_email_base.js
View file

@ -23,7 +23,6 @@ export default class NotificationSettingsEmailBase extends PureComponent {
emailInterval: PropTypes.string.isRequired,
enableEmailBatching: PropTypes.bool.isRequired,
sendEmailNotifications: PropTypes.bool.isRequired,
siteName: PropTypes.string,
theme: PropTypes.object.isRequired,
};

2
assets/base/i18n/en.json
View file

@ -594,7 +594,7 @@
"user.settings.notifications.email.immediately": "Immediately",
"user.settings.notifications.email.never": "Never",
"user.settings.notifications.email.send": "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.emailInfo": "Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.",
"user.settings.notifications.never": "Never",
"user.settings.notifications.onlyMentions": "Only for mentions and direct messages",
"user.settings.push_notification.away": "Away or offline",