Specifiy invalid chars in username error message

 - Refactored list of invalid chars out to constant

diff --git a/app/models/user.rb b/app/models/user.rb
index de5529e025bdbc042c02678a43880fd73d18ca67..42759dbd54c96c78acd34f92b19b5af24411b490 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -88,12 +88,17 @@ class User < ActiveRecord::Base
                     :default_url => "/assets/:class/:attachment/:style.png",
                     :styles => { :large => "100x100>", :small => "50x50>" }
 
+  INVALID_CHARS = "/;.,?%#"
+
   validates :display_name, :presence => true, :allow_nil => true, :length => 3..255,
                            :exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended]
   validates :display_name, :if => proc { |u| u.display_name_changed? },
                            :uniqueness => { :case_sensitive => false }
   validates :display_name, :if => proc { |u| u.display_name_changed? },
-                           :format => { :with => %r{\A[^\x00-\x1f\x7f\ufffe\uffff/;.,?%#]*\z} }
+                           :format => { :with => %r{\A[^\x00-\x1f\x7f\ufffe\uffff]*\z} }
+  validates :display_name, :if => proc { |u| u.display_name_changed? },
+                           :format => { :with => %r{\A[^#{INVALID_CHARS}]*\z},
+                                        :message => "cannot contain invalid chars: #{INVALID_CHARS}", invalid_chars: INVALID_CHARS }
   validates :display_name, :if => proc { |u| u.display_name_changed? },
                            :format => { :with => /\A\S/, :message => "has leading whitespace" }
   validates :display_name, :if => proc { |u| u.display_name_changed? },

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7b13a894bc860b3e09cddf1deee13f26e34b8a5a..d0b5596e875732388b6617001d9f9a1dc6166e17 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2134,6 +2134,7 @@ en:
       return to profile: Return to profile
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
+      invalid_chars: "cannot contain invalid chars: %{invalid_chars}"
     confirm:
       heading: Check your email!
       introduction_1: |