mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-08-30 22:36:05 +02:00
Fix the admin mailer config display (#20633)
This commit is contained in:
parent
2754ecc293
commit
90b2657ae7
2 changed files with 19 additions and 9 deletions
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue