Merge remote-tracking branch 'upstream/pull/2136'

[rails.git] / app / validators / characters_validator.rb

diff --git a/app/validators/characters_validator.rb b/app/validators/characters_validator.rb
index cbcd03a16df5034ee3f350916a3501073fb2c4ba..ee5b1206a08354c3406e2e383c331fe1089c23bf 100644 (file)
--- a/app/validators/characters_validator.rb
+++ b/app/validators/characters_validator.rb
@@ -3,10 +3,10 @@ class CharactersValidator < ActiveModel::EachValidator
   INVALID_URL_CHARS = "/;.,?%#".freeze
 
   def validate_each(record, attribute, value)
   INVALID_URL_CHARS = "/;.,?%#".freeze
 
   def validate_each(record, attribute, value)

-    record.errors[attribute] << (options[:message] || I18n.t("validations.invalid_chars")) if value =~ /[#{INVALID_CHARS}]/
+    record.errors[attribute] << (options[:message] || I18n.t("validations.invalid_characters")) if value =~ /[#{INVALID_CHARS}]/

 
     if options[:url_safe]
 
     if options[:url_safe]

-      record.errors[attribute] << (options[:message] || I18n.t("validations.invalid_url_chars", :invalid_url_chars => INVALID_URL_CHARS)) if value =~ /[#{INVALID_URL_CHARS}]/
+      record.errors[attribute] << (options[:message] || I18n.t("validations.url_characters", :characters => INVALID_URL_CHARS)) if value =~ /[#{INVALID_URL_CHARS}]/

     end
   end
 end
     end
   end
 end