diff options
-rw-r--r-- | conf/locale/TRANSLATORS | 1 | ||||
-rw-r--r-- | modules/auth/admin.go | 2 | ||||
-rw-r--r-- | modules/auth/user_form.go | 8 | ||||
-rw-r--r-- | templates/install.tmpl | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS index 135f3d7006..7c6eb0baf1 100644 --- a/conf/locale/TRANSLATORS +++ b/conf/locale/TRANSLATORS @@ -4,6 +4,7 @@ Akihiro YAGASAKI <yaggytter@momiage.com> Alexander Steinhöfer <kontakt@lx-s.de> Alexandre Magno <alexandre.mbm@gmail.com> +Barış Arda Yılmaz <ardayilmazgamer@gmail.com> Christoph Kisfeld <christoph.kisfeld@gmail.com> Daniel Speichert <daniel@speichert.pl> Gregor Santner <gdev@live.de> diff --git a/modules/auth/admin.go b/modules/auth/admin.go index a95b83de6a..596e5d642e 100644 --- a/modules/auth/admin.go +++ b/modules/auth/admin.go @@ -12,7 +12,7 @@ import ( type AdminEditUserForm struct { FullName string `form:"fullname" binding:"MaxSize(100)"` - Email string `binding:"Required;Email;MaxSize(50)"` + Email string `binding:"Required;Email;MaxSize(254)"` Password string `binding:"OmitEmpty;MinSize(6);MaxSize(255)"` Website string `binding:"MaxSize(50)"` Location string `binding:"MaxSize(50)"` diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go index e253d60f33..424a410f07 100644 --- a/modules/auth/user_form.go +++ b/modules/auth/user_form.go @@ -59,7 +59,7 @@ func (f *InstallForm) Validate(ctx *macaron.Context, errs binding.Errors) bindin type RegisterForm struct { UserName string `form:"uname" binding:"Required;AlphaDashDot;MaxSize(35)"` - Email string `form:"email" binding:"Required;Email;MaxSize(50)"` + Email string `form:"email" binding:"Required;Email;MaxSize(254)"` Password string `form:"password" binding:"Required;MaxSize(255)"` Retype string `form:"retype"` LoginType string `form:"logintype"` @@ -71,7 +71,7 @@ func (f *RegisterForm) Validate(ctx *macaron.Context, errs binding.Errors) bindi } type SignInForm struct { - UserName string `form:"uname" binding:"Required;MaxSize(35)"` + UserName string `form:"uname" binding:"Required;MaxSize(254)"` Password string `form:"password" binding:"Required;MaxSize(255)"` Remember bool `form:"remember"` } @@ -90,10 +90,10 @@ func (f *SignInForm) Validate(ctx *macaron.Context, errs binding.Errors) binding type UpdateProfileForm struct { UserName string `form:"uname" binding:"Required;MaxSize(35)"` FullName string `form:"fullname" binding:"MaxSize(100)"` - Email string `form:"email" binding:"Required;Email;MaxSize(50)"` + Email string `form:"email" binding:"Required;Email;MaxSize(254)"` Website string `form:"website" binding:"Url;MaxSize(100)"` Location string `form:"location" binding:"MaxSize(50)"` - Avatar string `form:"avatar" binding:"Required;Email;MaxSize(50)"` + Avatar string `form:"avatar" binding:"Required;Email;MaxSize(254)"` } func (f *UpdateProfileForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { diff --git a/templates/install.tmpl b/templates/install.tmpl index 6f35211e4f..5bf741afb0 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -89,7 +89,7 @@ </div> <div class="inline required field"> <label for="domain">{{.i18n.Tr "install.domain"}}</label> - <input id="domain" name="domain" value="{{.domain}}" required> + <input id="domain" name="domain" value="{{.domain}}" placeholder="e.g. try.gogs.io" required> <span class="help">{{.i18n.Tr "install.domain_helper"}}</span> </div> <div class="inline required field"> @@ -104,7 +104,7 @@ </div> <div class="inline required field"> <label for="app_url">{{.i18n.Tr "install.app_url"}}</label> - <input id="app_url" name="app_url" value="{{.app_url}}" required> + <input id="app_url" name="app_url" value="{{.app_url}}" placeholder="e.g. https://try.gogs.io" required> <span class="help">{{.i18n.Tr "install.app_url_helper"}}</span> </div> |