diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 686e353ea1..6fa33e97c0 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1412,6 +1412,9 @@ config.mailer_disable_helo = Disable HELO config.mailer_name = Name config.mailer_host = Host config.mailer_user = User +config.mailer_use_sendmail = Use Sendmail +config.mailer_sendmail_path = Sendmail Path +config.mailer_sendmail_args = Extra arguments to Sendmail config.send_test_mail = Send Test Email config.test_mail_failed = Failed to send test email to '%s': %v config.test_mail_sent = Test email has been sent to '%s'. diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index b57b1847f6..3af0c870c3 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -170,10 +170,19 @@ {{if .MailerEnabled}}
{{.i18n.Tr "admin.config.mailer_name"}}
{{.Mailer.Name}}
-
{{.i18n.Tr "admin.config.mailer_disable_helo"}}
-
-
{{.i18n.Tr "admin.config.mailer_host"}}
-
{{.Mailer.Host}}
+ {{if not .Mailer.UseSendmail}} +
{{.i18n.Tr "admin.config.mailer_disable_helo"}}
+
+
{{.i18n.Tr "admin.config.mailer_host"}}
+
{{.Mailer.Host}}
+ {{else}} +
{{.i18n.Tr "admin.config.mailer_use_sendmail"}}
+
+
{{.i18n.Tr "admin.config.mailer_sendmail_path"}}
+
{{.Mailer.SendmailPath}}
+
{{.i18n.Tr "admin.config.mailer_sendmail_args"}}
+
{{.Mailer.SendmailArgs}}
+ {{end}}
{{.i18n.Tr "admin.config.mailer_user"}}
{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}