diff options
author | David Lu <david.lu@hotmail.com> | 2016-06-16 05:44:02 -0700 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-06-16 08:44:02 -0400 |
commit | 3f333678d8b1f73dd66dca9a1a390169aaebaac8 (patch) | |
tree | bf1f352535f02a2d37bed46870fcc469b5a3b2d0 /webapp | |
parent | 4e38796e6964e22b61293568c85cea5e82c8e533 (diff) | |
download | chat-3f333678d8b1f73dd66dca9a1a390169aaebaac8.tar.gz chat-3f333678d8b1f73dd66dca9a1a390169aaebaac8.tar.bz2 chat-3f333678d8b1f73dd66dca9a1a390169aaebaac8.zip |
PLT-2971 Added email footer for address (#3319)
* Added email footer for address
* added default
* Update html.go
* Changed according to PM
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/admin_console/email_settings.jsx | 21 | ||||
-rw-r--r-- | webapp/i18n/en.json | 3 |
2 files changed, 24 insertions, 0 deletions
diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx index 3c30668d2..9ab943e4c 100644 --- a/webapp/components/admin_console/email_settings.jsx +++ b/webapp/components/admin_console/email_settings.jsx @@ -25,6 +25,7 @@ export default class EmailSettings extends AdminSettings { sendEmailNotifications: props.config.EmailSettings.SendEmailNotifications, feedbackName: props.config.EmailSettings.FeedbackName, feedbackEmail: props.config.EmailSettings.FeedbackEmail, + feedbackOrganization: props.config.EmailSettings.FeedbackOrganization, smtpUsername: props.config.EmailSettings.SMTPUsername, smtpPassword: props.config.EmailSettings.SMTPPassword, smtpServer: props.config.EmailSettings.SMTPServer, @@ -38,6 +39,7 @@ export default class EmailSettings extends AdminSettings { config.EmailSettings.SendEmailNotifications = this.state.sendEmailNotifications; config.EmailSettings.FeedbackName = this.state.feedbackName; config.EmailSettings.FeedbackEmail = this.state.feedbackEmail; + config.EmailSettings.FeedbackOrganization = this.state.feedbackOrganization; config.EmailSettings.SMTPUsername = this.state.smtpUsername; config.EmailSettings.SMTPPassword = this.state.smtpPassword; config.EmailSettings.SMTPServer = this.state.smtpServer; @@ -118,6 +120,25 @@ export default class EmailSettings extends AdminSettings { disabled={!this.state.sendEmailNotifications} /> <TextSetting + id='feedbackOrganization' + label={ + <FormattedMessage + id='admin.email.notificationOrganization' + defaultMessage='Notification Footer Address:' + /> + } + placeholder={Utils.localizeMessage('admin.email.notificationOrganizationExample', 'Ex: "© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA"')} + helpText={ + <FormattedMessage + id='admin.email.notificationOrganizationDescription' + defaultMessage='Organization name and address displayed on email notifications from Mattermost, such as "© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA". If the field is left empty, the organization name and address will not be displayed.' + /> + } + value={this.state.feedbackOrganization} + onChange={this.handleChange} + disabled={!this.state.sendEmailNotifications} + /> + <TextSetting id='smtpUsername' label={ <FormattedMessage diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 6fdc3c063..481dc4ba4 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -157,6 +157,9 @@ "admin.email.notificationEmailDescription": "Email address displayed on email account used when sending notification emails from Mattermost.", "admin.email.notificationEmailExample": "Ex: \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"", "admin.email.notificationEmailTitle": "Notification Email Address:", + "admin.email.notificationOrganization": "Notification Footer Address", + "admin.email.notificationOrganizationDescription": "Organization name and address displayed on email notifications from Mattermost, such as \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\". If the field is left empty, the organization name and address will not be displayed.", + "admin.email.nofificationOrganizationExample": "Ex. \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"", "admin.email.notificationsDescription": "Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.<br />Setting this to true removes the Preview Mode banner (requires logging out and logging back in after setting is changed).", "admin.email.notificationsTitle": "Send Email Notifications: ", "admin.email.passwordSaltDescription": "32-character salt added to signing of password reset emails. Randomly generated on install. Click \"Re-Generate\" to create new salt.", |