diff options
| -rw-r--r-- | modules/auth/user_form.go | 2 | ||||
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 | ||||
| -rw-r--r-- | routers/install.go | 6 | ||||
| -rw-r--r-- | templates/install.tmpl | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go index 0750d2219c..32c18872f3 100644 --- a/modules/auth/user_form.go +++ b/modules/auth/user_form.go @@ -33,7 +33,7 @@ type InstallForm struct { SMTPHost string SMTPFrom string - SMTPEmail string `binding:"OmitEmpty;Email;MaxSize(254)" locale:"install.mailer_user"` + SMTPUser string `binding:"OmitEmpty;MaxSize(254)" locale:"install.mailer_user"` SMTPPasswd string RegisterConfirm bool MailNotify bool diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9043ff12b6..5a8b4ebd22 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -97,7 +97,7 @@ email_title = Email Service Settings smtp_host = SMTP Host smtp_from = From smtp_from_helper = Mail from address, RFC 5322. It can be just an email address, or the "Name" <email@example.com> format. -mailer_user = Sender Email +mailer_user = Sender User mailer_password = Sender Password register_confirm = Enable Register Confirmation mail_notify = Enable Mail Notification diff --git a/routers/install.go b/routers/install.go index 664489570c..b4df536d0c 100644 --- a/routers/install.go +++ b/routers/install.go @@ -99,7 +99,7 @@ func Install(ctx *context.Context) { if setting.MailService != nil { form.SMTPHost = setting.MailService.Host form.SMTPFrom = setting.MailService.From - form.SMTPEmail = setting.MailService.User + form.SMTPUser = setting.MailService.User } form.RegisterConfirm = setting.Service.RegisterEmailConfirm form.MailNotify = setting.Service.EnableNotifyMail @@ -124,7 +124,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { ctx.Data["CurDbOption"] = form.DbType if ctx.HasError() { - if ctx.HasValue("Err_SMTPEmail") { + if ctx.HasValue("Err_SMTPUser") { ctx.Data["Err_SMTP"] = true } if ctx.HasValue("Err_AdminName") || @@ -279,7 +279,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { cfg.Section("mailer").Key("ENABLED").SetValue("true") cfg.Section("mailer").Key("HOST").SetValue(form.SMTPHost) cfg.Section("mailer").Key("FROM").SetValue(form.SMTPFrom) - cfg.Section("mailer").Key("USER").SetValue(form.SMTPEmail) + cfg.Section("mailer").Key("USER").SetValue(form.SMTPUser) cfg.Section("mailer").Key("PASSWD").SetValue(form.SMTPPasswd) } else { cfg.Section("mailer").Key("ENABLED").SetValue("false") diff --git a/templates/install.tmpl b/templates/install.tmpl index 5fc056c55a..d084005c8c 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -140,9 +140,9 @@ <input id="smtp_from" name="smtp_from" value="{{.smtp_from}}"> <span class="help">{{.i18n.Tr "install.smtp_from_helper"}}</span> </div> - <div class="inline field {{if .Err_SMTPEmail}}error{{end}}"> - <label for="smtp_email">{{.i18n.Tr "install.mailer_user"}}</label> - <input id="smtp_email" name="smtp_email" value="{{.smtp_email}}"> + <div class="inline field {{if .Err_SMTPUser}}error{{end}}"> + <label for="smtp_user">{{.i18n.Tr "install.mailer_user"}}</label> + <input id="smtp_user" name="smtp_user" value="{{.smtp_user}}"> </div> <div class="inline field"> <label for="smtp_passwd">{{.i18n.Tr "install.mailer_password"}}</label> |