UI: install - new version

modules/auth/auth.go

@@ -208,7 +208,14 @@ func validate(errs binding.Errors, data map[string]interface{}, f Form, l macaro
 
 		if errs[0].FieldNames[0] == field.Name {
 			data["Err_"+field.Name] = true
-			trName := l.Tr("form." + field.Name)
+
+			trName := field.Tag.Get("locale")
+			if len(trName) == 0 {
+				trName = l.Tr("form." + field.Name)
+			} else {
+				trName = l.Tr(trName)
+			}
+
 			switch errs[0].Classification {
 			case binding.ERR_REQUIRED:
 				data["ErrorMsg"] = trName + l.Tr("form.require_error")

modules/auth/user_form.go

@@ -17,22 +17,22 @@ type InstallForm struct {
 	DbUser             string
 	DbPasswd           string
 	DbName             string
-	SSLMode            string
+	SSLMode            string `form:"ssl_mode"`
 	DbPath             string
 	RepoRootPath       string `binding:"Required"`
 	RunUser            string `binding:"Required"`
 	Domain             string `binding:"Required"`
-	HTTPPort           string `binding:"Required"`
+	HTTPPort           string `form:"http_port" binding:"Required"`
 	AppUrl             string `binding:"Required"`
-	SMTPHost           string
-	SMTPEmail          string
-	SMTPPasswd         string
-	RegisterConfirm    string
-	MailNotify         string
-	AdminName          string `binding:"Required;AlphaDashDot;MaxSize(30)"`
-	AdminPasswd        string `binding:"Required;MinSize(6);MaxSize(255)"`
-	AdminConfirmPasswd string `binding:"Required;MinSize(6);MaxSize(255)"`
-	AdminEmail         string `binding:"Required;Email;MaxSize(50)"`
+	SMTPHost           string `form:"smtp_host"`
+	SMTPEmail          string `form:"smtp_user" binding:"OmitEmpty;Email;MaxSize(50)" locale:"install.mailer_user"`
+	SMTPPasswd         string `form:"smtp_passwd"`
+	RegisterConfirm    bool
+	MailNotify         bool
+	AdminName          string `binding:"OmitEmpty;AlphaDashDot;MaxSize(30)" locale:"install.admin_name"`
+	AdminPasswd        string `binding:"OmitEmpty;MinSize(6);MaxSize(255)" locale:"install.admin_password"`
+	AdminConfirmPasswd string
+	AdminEmail         string `binding:"OmitEmpty;Email;MaxSize(50)" locale:"install.admin_email"`
 }
 
 func (f *InstallForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {

modules/middleware/context.go

@@ -106,6 +106,12 @@ func (ctx *Context) HasError() bool {
 	return hasErr.(bool)
 }
 
+// HasValue returns true if value of given name exists.
+func (ctx *Context) HasValue(name string) bool {
+	_, ok := ctx.Data[name]
+	return ok
+}
+
 // HTML calls Context.HTML and converts template name to string.
 func (ctx *Context) HTML(status int, name base.TplName) {
 	ctx.Context.HTML(status, string(name))
@@ -140,7 +146,7 @@ func (ctx *Context) Handle(status int, title string, err error) {
 }
 
 func (ctx *Context) HandleText(status int, title string) {
-	if (status / 100 == 4) || (status / 100 == 5) {
+	if (status/100 == 4) || (status/100 == 5) {
 		log.Error(4, "%s", title)
 	}
 	ctx.RenderData(status, []byte(title))