Minor grammatical fix for Disable Registration feature

diff --git a/conf/app.ini b/conf/app.ini
index 7dbbf600533a3ff6b0d56e9935913304003ce1ab..25fd41091f44f9d9878a8a1d580e718986905c7c 100644 (file)
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -53,7 +53,7 @@ RESET_PASSWD_CODE_LIVE_MINUTES = 180
 ; User need to confirm e-mail for registration
 REGISTER_EMAIL_CONFIRM = false
 ; Does not allow register and admin create account only
-DISENABLE_REGISTERATION = false
+DISABLE_REGISTRATION = false
 ; User must sign in to view anything.
 REQUIRE_SIGNIN_VIEW = false
 ; Cache avatar as picture

diff --git a/modules/base/conf.go b/modules/base/conf.go
index 48ba46583adb351c61a8f33b774b00423c97c3b5..abb67f6d8ff7936c359367e2f8b1036ab4050234 100644 (file)
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -84,7 +84,7 @@ var (
 
 var Service struct {
        RegisterEmailConfirm   bool
-       DisenableRegisteration bool
+       DisableRegistration    bool
        RequireSignInView      bool
        EnableCacheAvatar      bool
        NotifyMail             bool
@@ -116,7 +116,7 @@ var logLevels = map[string]string{
 func newService() {
        Service.ActiveCodeLives = Cfg.MustInt("service", "ACTIVE_CODE_LIVE_MINUTES", 180)
        Service.ResetPwdCodeLives = Cfg.MustInt("service", "RESET_PASSWD_CODE_LIVE_MINUTES", 180)
-       Service.DisenableRegisteration = Cfg.MustBool("service", "DISENABLE_REGISTERATION", false)
+       Service.DisableRegistration = Cfg.MustBool("service", "DISABLE_REGISTRATION", false)
        Service.RequireSignInView = Cfg.MustBool("service", "REQUIRE_SIGNIN_VIEW", false)
        Service.EnableCacheAvatar = Cfg.MustBool("service", "ENABLE_CACHE_AVATAR", false)
 }

diff --git a/routers/user/user.go b/routers/user/user.go
index 91b51ceec9809c137db0da552f775897e9b3e3b7..7decd72d4e21fb952f6e96cdf64c71c255a02207 100644 (file)
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -169,8 +169,8 @@ func SignUp(ctx *middleware.Context) {
        ctx.Data["Title"] = "Sign Up"
        ctx.Data["PageIsSignUp"] = true
 
-       if base.Service.DisenableRegisteration {
-               ctx.Data["DisenableRegisteration"] = true
+       if base.Service.DisableRegistration {
+               ctx.Data["DisableRegistration"] = true
                ctx.HTML(200, "user/signup")
                return
        }
@@ -208,7 +208,7 @@ func SignUpPost(ctx *middleware.Context, form auth.RegisterForm) {
        ctx.Data["Title"] = "Sign Up"
        ctx.Data["PageIsSignUp"] = true
 
-       if base.Service.DisenableRegisteration {
+       if base.Service.DisableRegistration {
                ctx.Handle(403, "user.SignUpPost", nil)
                return
        }

diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 8263763d0c8cc9a67144808fcabbeee4ea87fc2e..d25d40275a679bd54ad22b1b626c8fe099a69654 100644 (file)
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -62,8 +62,8 @@
                 <dl class="dl-horizontal admin-dl-horizontal">
                     <dt>Register Email Confirmation</dt>
                     <dd><i class="fa fa{{if .Service.RegisterEmailConfirm}}-check{{end}}-square-o"></i></dd>
-                    <dt>Disenable Registeration</dt>
-                    <dd><i class="fa fa{{if .Service.DisenableRegisteration}}-check{{end}}-square-o"></i></dd>
+                    <dt>Disable Registration</dt>
+                    <dd><i class="fa fa{{if .Service.DisableRegistration}}-check{{end}}-square-o"></i></dd>
                     <dt>Require Sign In View</dt>
                     <dd><i class="fa fa{{if .Service.RequireSignInView}}-check{{end}}-square-o"></i></dd>
                     <dt>Mail Notification</dt>

diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl
index d6af74c1a81eb2cb3bf831c8efcab85fde0ac0aa..578ffa9eed4a3347b04efbc5f2ee38e34c2bdf24 100644 (file)
--- a/templates/user/signup.tmpl
+++ b/templates/user/signup.tmpl
@@ -3,7 +3,7 @@
 <div class="container" id="body">
        <form action="/user/sign_up" method="post" class="form-horizontal card" id="login-card">
                {{.CsrfTokenHtml}}
-               {{if .DisenableRegisteration}}
+               {{if .DisableRegistration}}
                Sorry, registration has been disabled. Please contact the site administrator.
                {{else}}
                {{if .IsSocialLogin}}