X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c24c2e481cc6d27e76274ed4e32668a4690a7788..367fa44a74c06563b6f0e23c1e9db888769f57f0:/app/validators/whitespace_validator.rb?ds=sidebyside diff --git a/app/validators/whitespace_validator.rb b/app/validators/whitespace_validator.rb index 333ad0e05..6453742c2 100644 --- a/app/validators/whitespace_validator.rb +++ b/app/validators/whitespace_validator.rb @@ -1,11 +1,6 @@ class WhitespaceValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) - unless options.fetch(:leading, true) - record.errors[attribute] << (options[:message] || I18n.t("validations.leading_whitespace")) if /\A\s/.match?(value) - end - - unless options.fetch(:trailing, true) - record.errors[attribute] << (options[:message] || I18n.t("validations.trailing_whitespace")) if /\s\z/.match?(value) - end + record.errors.add(attribute, options[:message] || I18n.t("validations.leading_whitespace")) if !options.fetch(:leading, true) && /\A\s/.match?(value) + record.errors.add(attribute, options[:message] || I18n.t("validations.trailing_whitespace")) if !options.fetch(:trailing, true) && /\s\z/.match?(value) end end