Commit 430a922d authored by David Lu's avatar David Lu Committed by Harrison Healey
Browse files

PLT-2971 Added email footer for address (#3319)

* Added email footer for address

* added default

* Update html.go

* Changed according to PM
parent 0e4fc96e
...@@ -25,6 +25,7 @@ export default class EmailSettings extends AdminSettings { ...@@ -25,6 +25,7 @@ export default class EmailSettings extends AdminSettings {
sendEmailNotifications: props.config.EmailSettings.SendEmailNotifications, sendEmailNotifications: props.config.EmailSettings.SendEmailNotifications,
feedbackName: props.config.EmailSettings.FeedbackName, feedbackName: props.config.EmailSettings.FeedbackName,
feedbackEmail: props.config.EmailSettings.FeedbackEmail, feedbackEmail: props.config.EmailSettings.FeedbackEmail,
feedbackOrganization: props.config.EmailSettings.FeedbackOrganization,
smtpUsername: props.config.EmailSettings.SMTPUsername, smtpUsername: props.config.EmailSettings.SMTPUsername,
smtpPassword: props.config.EmailSettings.SMTPPassword, smtpPassword: props.config.EmailSettings.SMTPPassword,
smtpServer: props.config.EmailSettings.SMTPServer, smtpServer: props.config.EmailSettings.SMTPServer,
...@@ -38,6 +39,7 @@ export default class EmailSettings extends AdminSettings { ...@@ -38,6 +39,7 @@ export default class EmailSettings extends AdminSettings {
config.EmailSettings.SendEmailNotifications = this.state.sendEmailNotifications; config.EmailSettings.SendEmailNotifications = this.state.sendEmailNotifications;
config.EmailSettings.FeedbackName = this.state.feedbackName; config.EmailSettings.FeedbackName = this.state.feedbackName;
config.EmailSettings.FeedbackEmail = this.state.feedbackEmail; config.EmailSettings.FeedbackEmail = this.state.feedbackEmail;
config.EmailSettings.FeedbackOrganization = this.state.feedbackOrganization;
config.EmailSettings.SMTPUsername = this.state.smtpUsername; config.EmailSettings.SMTPUsername = this.state.smtpUsername;
config.EmailSettings.SMTPPassword = this.state.smtpPassword; config.EmailSettings.SMTPPassword = this.state.smtpPassword;
config.EmailSettings.SMTPServer = this.state.smtpServer; config.EmailSettings.SMTPServer = this.state.smtpServer;
...@@ -117,6 +119,25 @@ export default class EmailSettings extends AdminSettings { ...@@ -117,6 +119,25 @@ export default class EmailSettings extends AdminSettings {
onChange={this.handleChange} onChange={this.handleChange}
disabled={!this.state.sendEmailNotifications} 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 <TextSetting
id='smtpUsername' id='smtpUsername'
label={ label={
......
...@@ -157,6 +157,9 @@ ...@@ -157,6 +157,9 @@
"admin.email.notificationEmailDescription": "Email address displayed on email account used when sending notification emails from Mattermost.", "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.notificationEmailExample": "Ex: \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"",
"admin.email.notificationEmailTitle": "Notification Email Address:", "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.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.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.", "admin.email.passwordSaltDescription": "32-character salt added to signing of password reset emails. Randomly generated on install. Click \"Re-Generate\" to create new salt.",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment