#1579 change e-mail max length to 254

diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS
index 135f3d7006ed479b00ac068e0fbdd0adee6751e9..7c6eb0baf17ef16d9ecf8391ba432ea761320f0f 100644 (file)
--- 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 a95b83de6a6ac398beaeabc0c24c6a439f02ef38..596e5d642ed2f2f2cdc88425f986ce4601d6fab6 100644 (file)
--- 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 e253d60f337bf4a4c1225d70f48e4786f0b33849..424a410f079b638f27eb15bbe996f6682f08dc3d 100644 (file)
--- 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 6f35211e4fdb929f24e0f9f8ba88a4ec6b8d305b..5bf741afb0df9d998025b935cd6f1f4819631466 100644 (file)
--- 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>