From e091246ffc2d640f0a7f2324998315b33b891847 Mon Sep 17 00:00:00 2001 From: J Guthrie Date: Mon, 5 Nov 2018 01:55:25 +0000 Subject: [PATCH] Converted invalid_chars validator to use locale --- app/validators/invalid_chars_validator.rb | 2 +- app/validators/invalid_url_chars_validator.rb | 2 +- app/validators/leading_whitespace_validator.rb | 2 +- app/validators/trailing_whitespace_validator.rb | 2 +- config/locales/en.yml | 7 ++++--- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/validators/invalid_chars_validator.rb b/app/validators/invalid_chars_validator.rb index 3860c95a3..f21f5a7cd 100644 --- a/app/validators/invalid_chars_validator.rb +++ b/app/validators/invalid_chars_validator.rb @@ -2,6 +2,6 @@ class InvalidCharsValidator < ActiveModel::EachValidator INVALID_CHARS = "\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff".freeze def validate_each(record, attribute, value) - record.errors[attribute] << (options[:message] || "contains invalid chars") if value =~ /[#{INVALID_CHARS}]/ + record.errors[attribute] << (options[:message] || I18n.t("validations.invalid_chars")) if value =~ /[#{INVALID_CHARS}]/ end end diff --git a/app/validators/invalid_url_chars_validator.rb b/app/validators/invalid_url_chars_validator.rb index 38c4006b7..a93f6c6d9 100644 --- a/app/validators/invalid_url_chars_validator.rb +++ b/app/validators/invalid_url_chars_validator.rb @@ -2,6 +2,6 @@ class InvalidUrlCharsValidator < ActiveModel::EachValidator INVALID_URL_CHARS = "/;.,?%#".freeze def validate_each(record, attribute, value) - record.errors[attribute] << (options[:message] || I18n.t("validations.invalid chars", :invalid_chars => INVALID_URL_CHARS)) if value =~ /[#{INVALID_URL_CHARS}]/ + record.errors[attribute] << (options[:message] || I18n.t("validations.invalid_url_chars", :invalid_url_chars => INVALID_URL_CHARS)) if value =~ /[#{INVALID_URL_CHARS}]/ end end diff --git a/app/validators/leading_whitespace_validator.rb b/app/validators/leading_whitespace_validator.rb index e33d3c01b..90e7d9c95 100644 --- a/app/validators/leading_whitespace_validator.rb +++ b/app/validators/leading_whitespace_validator.rb @@ -1,5 +1,5 @@ class LeadingWhitespaceValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) - record.errors[attribute] << (options[:message] || I18n.t("validations.leading whitespace")) if value =~ /\A\s/ + record.errors[attribute] << (options[:message] || I18n.t("validations.leading_whitespace")) if value =~ /\A\s/ end end diff --git a/app/validators/trailing_whitespace_validator.rb b/app/validators/trailing_whitespace_validator.rb index 03d6ef4db..aacc6dd04 100644 --- a/app/validators/trailing_whitespace_validator.rb +++ b/app/validators/trailing_whitespace_validator.rb @@ -1,5 +1,5 @@ class TrailingWhitespaceValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) - record.errors[attribute] << (options[:message] || I18n.t("validations.trailing whitespace")) if value =~ /\s\z/ + record.errors[attribute] << (options[:message] || I18n.t("validations.trailing_whitespace")) if value =~ /\s\z/ end end diff --git a/config/locales/en.yml b/config/locales/en.yml index c53ae19c8..112f3a207 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2563,6 +2563,7 @@ en: flash: "Redaction destroyed." error: "There was an error destroying this redaction." validations: - leading whitespace: "has leading whitespace" - trailing whitespace: "has trailing whitespace" - invalid chars: "must not contain an invalid char: %{invalid_chars}" + 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}" -- 2.43.2