Added trailing/leading whitespace errors to locale

diff --git a/app/models/user.rb b/app/models/user.rb
index 42759dbd54c96c78acd34f92b19b5af24411b490..b3325e4eb55617025fc5a380afeb44f192e17d24 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -98,11 +98,11 @@ class User < ActiveRecord::Base
                            :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 }
+                                        :message => I18n.t("users.account.invalid chars", invalid_chars: INVALID_CHARS) }
   validates :display_name, :if => proc { |u| u.display_name_changed? },
-                           :format => { :with => /\A\S/, :message => "has leading whitespace" }
+                           :format => { :with => /\A\S/, :message => I18n.t("users.account.leading whitespace") }
   validates :display_name, :if => proc { |u| u.display_name_changed? },
-                           :format => { :with => /\S\z/, :message => "has trailing whitespace" }
+                           :format => { :with => /\S\z/, :message => I18n.t("users.account.trailing whitespace") }
   validates :email, :presence => true, :confirmation => true
   validates :email, :if => proc { |u| u.email_changed? },
                     :uniqueness => { :case_sensitive => false }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d0b5596e875732388b6617001d9f9a1dc6166e17..0a5ee729d4652f1146e87b96e843abab114871de 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2134,7 +2134,9 @@ 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}"
+      leading whitespace: "has leading whitespace"
+      trailing whitespace: "has trailing whitespace"
+      invalid chars: "cannot contain invalid chars: %{invalid_chars}"
     confirm:
       heading: Check your email!
       introduction_1: |