Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UsernameValidator error messages weren't matching the code

This commit is contained in:
Régis Hanol 2016-02-18 23:19:14 +01:00
parent 283ff4c7f8
commit e204144a58
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/username_validator.rb
View File

@ -71,7 +71,7 @@ class UsernameValidator
def username_first_char_valid? def username_first_char_valid?
return unless errors.empty? return unless errors.empty?
if username[0] =~ /\W/ if username[0] =~ /\W/
self.errors << I18n.t(:'user.username.must_begin_with_alphanumeric') self.errors << I18n.t(:'user.username.must_begin_with_alphanumeric_or_underscore')
end end
end end

4
config/locales/server.en.yml
View File

@ -1397,8 +1397,8 @@ en:
characters: "must only include numbers, letters and underscores" characters: "must only include numbers, letters and underscores"
unique: "must be unique" unique: "must be unique"
blank: "must be present" blank: "must be present"
must_begin_with_alphanumeric: "must begin with a letter or number or an underscore" must_begin_with_alphanumeric_or_underscore: "must begin with a letter, a number or an underscore"
must_end_with_alphanumeric: "must end with a letter or number or an underscore" must_end_with_alphanumeric: "must end with a letter or a number"
must_not_contain_two_special_chars_in_seq: "must not contain a sequence of 2 or more special chars (.-_)" must_not_contain_two_special_chars_in_seq: "must not contain a sequence of 2 or more special chars (.-_)"
must_not_end_with_confusing_suffix: "must not end with a confusing suffix like .json or .png etc." must_not_end_with_confusing_suffix: "must not end with a confusing suffix like .json or .png etc."
email: email: