mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Fix the admin mailer config display (#20633)

This commit is contained in:
wxiaoguang 2022-08-03 00:43:27 +08:00 committed by GitHub
parent 2754ecc293
commit 90b2657ae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
options/locale/locale_en-US.ini
View File

@ -2796,16 +2796,19 @@ config.queue_length = Queue Length
config.deliver_timeout = Deliver Timeout config.deliver_timeout = Deliver Timeout
config.skip_tls_verify = Skip TLS Verification config.skip_tls_verify = Skip TLS Verification
config.mailer_config = SMTP Mailer Configuration config.mailer_config = Mailer Configuration
config.mailer_enabled = Enabled config.mailer_enabled = Enabled
config.mailer_disable_helo = Disable HELO config.mailer_enable_helo = Enable HELO
config.mailer_name = Name 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_user = User
config.mailer_use_sendmail = Use Sendmail config.mailer_use_sendmail = Use Sendmail
config.mailer_sendmail_path = Sendmail Path config.mailer_sendmail_path = Sendmail Path
config.mailer_sendmail_args = Extra Arguments to Sendmail config.mailer_sendmail_args = Extra Arguments to Sendmail
config.mailer_sendmail_timeout = Sendmail Timeout config.mailer_sendmail_timeout = Sendmail Timeout
config.mailer_use_dummy = Dummy
config.test_email_placeholder = Email (e.g. test@example.com) config.test_email_placeholder = Email (e.g. test@example.com)
config.send_test_mail = Send Testing Email config.send_test_mail = Send Testing Email
config.test_mail_failed = Failed to send a testing email to '%s': %v config.test_mail_failed = Failed to send a testing email to '%s': %v

19
templates/admin/config.tmpl
View File

@ -218,12 +218,7 @@
{{if .MailerEnabled}} {{if .MailerEnabled}}
<dt>{{.locale.Tr "admin.config.mailer_name"}}</dt> <dt>{{.locale.Tr "admin.config.mailer_name"}}</dt>
<dd>{{.Mailer.Name}}</dd> <dd>{{.Mailer.Name}}</dd>
{{if eq .Mailer.MailerType "smtp"}} {{if eq .Mailer.Protocol "sendmail"}}
<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"}}
<dt>{{.locale.Tr "admin.config.mailer_use_sendmail"}}</dt> <dt>{{.locale.Tr "admin.config.mailer_use_sendmail"}}</dt>
<dd>{{svg "octicon-check"}}</dd> <dd>{{svg "octicon-check"}}</dd>
<dt>{{.locale.Tr "admin.config.mailer_sendmail_path"}}</dt> <dt>{{.locale.Tr "admin.config.mailer_sendmail_path"}}</dt>
@ -232,6 +227,18 @@
<dd>{{.Mailer.SendmailArgs}}</dd> <dd>{{.Mailer.SendmailArgs}}</dd>
<dt>{{.locale.Tr "admin.config.mailer_sendmail_timeout"}}</dt> <dt>{{.locale.Tr "admin.config.mailer_sendmail_timeout"}}</dt>
<dd>{{.Mailer.SendmailTimeout}} {{.locale.Tr "tool.raw_seconds"}}</dd> <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}} {{end}}
<dt>{{.locale.Tr "admin.config.mailer_user"}}</dt> <dt>{{.locale.Tr "admin.config.mailer_user"}}</dt>
<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br> <dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>