a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Localised the registration errors.

This commit is contained in:
Azareal 2018-09-30 19:48:31 +10:00
parent d675b2720f
commit dea74eb32a
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
langs/english.json
View File

@ -86,7 +86,17 @@
"banned_body":"You have been banned from this site.", "banned_body":"You have been banned from this site.",
"id_must_be_integer": "The ID must be an integer.", "id_must_be_integer": "The ID must be an integer.",
"url_id_must_be_integer": "The ID in the URL needs to be a valid integer." "url_id_must_be_integer": "The ID in the URL needs to be a valid integer.",
"register_might_be_machine":"You might be a machine.",
"register_need_username":"You didn't put in a username.",
"register_need_email":"You didn't put in an email.",
"register_first_word_numeric":"The first word of your name must not be purely numeric",
"register_suspicious_email":"Your email address is suspicious.",
"register_password_mismatch":"The two passwords don't match.",
"register_username_unavailable":"This username isn't available. Try another.",
"register_username_too_long_prefix":"The username is too long, max: ",
"register_email_fail":"We were unable to send the email for you to confirm that this email address belongs to you. You may not have access to some functionality until you do so. Please ask an administrator for assistance."
}, },
"PageTitles": { "PageTitles": {

20
routes/account.go
View File

@ -237,34 +237,34 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user common.U
} }
if r.PostFormValue("tos") != "0" { if r.PostFormValue("tos") != "0" {
regError("You might be a machine.", "trap-question") regError(common.GetErrorPhrase("register_might_be_machine"), "trap-question")
} }
h := sha256.New() h := sha256.New()
h.Write([]byte(common.JSTokenBox.Load().(string))) h.Write([]byte(common.JSTokenBox.Load().(string)))
h.Write([]byte(user.LastIP)) h.Write([]byte(user.LastIP))
if r.PostFormValue("golden-watch") != hex.EncodeToString(h.Sum(nil)) { if r.PostFormValue("golden-watch") != hex.EncodeToString(h.Sum(nil)) {
regError("You might be a machine.", "js-antispam") regError(common.GetErrorPhrase("register_might_be_machine"), "js-antispam")
} }
username := common.SanitiseSingleLine(r.PostFormValue("username")) username := common.SanitiseSingleLine(r.PostFormValue("username"))
// TODO: Add a dedicated function for validating emails // TODO: Add a dedicated function for validating emails
email := common.SanitiseSingleLine(r.PostFormValue("email")) email := common.SanitiseSingleLine(r.PostFormValue("email"))
if username == "" { if username == "" {
regError("You didn't put in a username.", "no-username") regError(common.GetErrorPhrase("register_need_username"), "no-username")
} }
if email == "" { if email == "" {
regError("You didn't put in an email.", "no-email") regError(common.GetErrorPhrase("register_need_email"), "no-email")
} }
// This is so a numeric name won't interfere with mentioning a user by ID, there might be a better way of doing this like perhaps !@ to mean IDs and @ to mean usernames in the pre-parser // This is so a numeric name won't interfere with mentioning a user by ID, there might be a better way of doing this like perhaps !@ to mean IDs and @ to mean usernames in the pre-parser
usernameBits := strings.Split(username, " ") usernameBits := strings.Split(username, " ")
if isNumeric(usernameBits[0]) { if isNumeric(usernameBits[0]) {
regError("The first word of your name may not be purely numeric", "numeric-name") regError(common.GetErrorPhrase("register_first_word_numeric"), "numeric-name")
} }
ok := common.HasSuspiciousEmail(email) ok := common.HasSuspiciousEmail(email)
if ok { if ok {
regError("Your email address is suspicious.", "suspicious-email") regError(common.GetErrorPhrase("register_suspicious_email"), "suspicious-email")
} }
password := r.PostFormValue("password") password := r.PostFormValue("password")
@ -276,7 +276,7 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user common.U
// Do the two inputted passwords match..? // Do the two inputted passwords match..?
confirmPassword := r.PostFormValue("confirm_password") confirmPassword := r.PostFormValue("confirm_password")
if password != confirmPassword { if password != confirmPassword {
regError("The two passwords don't match.", "password-mismatch") regError(common.GetErrorPhrase("register_password_mismatch"), "password-mismatch")
} }
} }
@ -309,14 +309,14 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user common.U
if err != nil { if err != nil {
return common.InternalError(err, w, r) return common.InternalError(err, w, r)
} }
return common.LocalError("This username isn't available. Try another.", w, r, user) return common.LocalError(common.GetErrorPhrase("register_username_unavailable"), w, r, user)
} else if err == common.ErrLongUsername { } else if err == common.ErrLongUsername {
regLog.FailureReason += "username-too-long" regLog.FailureReason += "username-too-long"
err = regLog.Commit() err = regLog.Commit()
if err != nil { if err != nil {
return common.InternalError(err, w, r) return common.InternalError(err, w, r)
} }
return common.LocalError("The username is too long, max: "+strconv.Itoa(common.Config.MaxUsernameLength), w, r, user) return common.LocalError(common.GetErrorPhrase("register_username_too_long_prefix")+strconv.Itoa(common.Config.MaxUsernameLength), w, r, user)
} }
regLog.FailureReason += "internal-error" regLog.FailureReason += "internal-error"
err2 := regLog.Commit() err2 := regLog.Commit()
@ -340,7 +340,7 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user common.U
} }
if !common.SendValidationEmail(username, email, token) { if !common.SendValidationEmail(username, email, token) {
return common.LocalError("We were unable to send the email for you to confirm that this email address belongs to you. You may not have access to some functionality until you do so. Please ask an administrator for assistance.", w, r, user) return common.LocalError(common.GetErrorPhrase("register_email_fail"), w, r, user)
} }
} }