From: Tom Hughes <tom@compton.nu>
Date: Mon, 5 Nov 2018 18:58:08 +0000 (+0000)
Subject: Improve character validator error messages
X-Git-Tag: live~2773^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/56f7e692cd7112033654587556cb3eb9d2cf72de?ds=inline

Improve character validator error messages
---

diff --git a/app/validators/characters_validator.rb b/app/validators/characters_validator.rb
index cbcd03a16..ee5b1206a 100644
--- 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)
-    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]
-      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
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 112f3a207..a9370018a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2565,5 +2565,5 @@ en:
   validations:
     leading_whitespace: "has leading whitespace"
     trailing_whitespace: "has trailing whitespace"
-    invalid_chars: "contains invalid chars"
-    invalid_url_chars: "must not contain an invalid char: %{invalid_url_chars}"
+    invalid_characters: "contains invalid characters"
+    url_characters: "contains special URL characters (%{characters})"