diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2022-08-03 00:43:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-03 00:43:27 +0800 |
| commit | 90b2657ae7f022f0a9fe2ba7199c60d32a36d673 (patch) | |
| tree | 35790b07a974744deb2c440a6be662f7a969b33a | |
| parent | 2754ecc293ffa8c9b44f2bd60dc83d295fc037ba (diff) | |
| download | gitea-90b2657ae7f022f0a9fe2ba7199c60d32a36d673.tar.gz gitea-90b2657ae7f022f0a9fe2ba7199c60d32a36d673.zip | |
Fix the admin mailer config display (#20633)
| -rw-r--r-- | options/locale/locale_en-US.ini | 9 | ||||
| -rw-r--r-- | templates/admin/config.tmpl | 19 |
2 files changed, 19 insertions, 9 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a774bf92ff..b6f00727ea 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2796,16 +2796,19 @@ config.queue_length = Queue Length config.deliver_timeout = Deliver Timeout config.skip_tls_verify = Skip TLS Verification -config.mailer_config = SMTP Mailer Configuration +config.mailer_config = Mailer Configuration config.mailer_enabled = Enabled -config.mailer_disable_helo = Disable HELO +config.mailer_enable_helo = Enable HELO config.mailer_name = Name -config.mailer_host = Host +config.mailer_protocol = Protocol +config.mailer_smtp_addr = SMTP Addr +config.mailer_smtp_port = SMTP Port 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.mailer_sendmail_timeout = Sendmail Timeout +config.mailer_use_dummy = Dummy config.test_email_placeholder = Email (e.g. test@example.com) config.send_test_mail = Send Testing Email config.test_mail_failed = Failed to send a testing email to '%s': %v diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index a55a797262..ccd1029cd8 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -218,12 +218,7 @@ {{if .MailerEnabled}} <dt>{{.locale.Tr "admin.config.mailer_name"}}</dt> <dd>{{.Mailer.Name}}</dd> - {{if eq .Mailer.MailerType "smtp"}} - <dt>{{.locale.Tr "admin.config.mailer_disable_helo"}}</dt> - <dd>{{if .DisableHelo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd> - <dt>{{.locale.Tr "admin.config.mailer_host"}}</dt> - <dd>{{.Mailer.Host}}</dd> - {{else if eq .Mailer.MailerType "sendmail"}} + {{if eq .Mailer.Protocol "sendmail"}} <dt>{{.locale.Tr "admin.config.mailer_use_sendmail"}}</dt> <dd>{{svg "octicon-check"}}</dd> <dt>{{.locale.Tr "admin.config.mailer_sendmail_path"}}</dt> @@ -232,6 +227,18 @@ <dd>{{.Mailer.SendmailArgs}}</dd> <dt>{{.locale.Tr "admin.config.mailer_sendmail_timeout"}}</dt> <dd>{{.Mailer.SendmailTimeout}} {{.locale.Tr "tool.raw_seconds"}}</dd> + {{else if eq .Mailer.Protocol "dummy"}} + <dt>{{.locale.Tr "admin.config.mailer_use_dummy"}}</dt> + <dd>{{svg "octicon-check"}}</dd> + {{else}}{{/* SMTP family */}} + <dt>{{.locale.Tr "admin.config.mailer_protocol"}}</dt> + <dd>{{.Mailer.Protocol}}</dd> + <dt>{{.locale.Tr "admin.config.mailer_enable_helo"}}</dt> + <dd>{{if .Mailer.EnableHelo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd> + <dt>{{.locale.Tr "admin.config.mailer_smtp_addr"}}</dt> + <dd>{{.Mailer.SMTPAddr}}</dd> + <dt>{{.locale.Tr "admin.config.mailer_smtp_port"}}</dt> + <dd>{{.Mailer.SMTPPort}}</dd> {{end}} <dt>{{.locale.Tr "admin.config.mailer_user"}}</dt> <dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br> |