X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/783b5e3729228908d7404ae7404af1023501a906..7e0fb05dd2128ea7e93ac214bca813388ceaa012:/app/validators/whitespace_validator.rb diff --git a/app/validators/whitespace_validator.rb b/app/validators/whitespace_validator.rb index d177df92a..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 value =~ /\A\s/ - end - - unless options.fetch(:trailing, true) - record.errors[attribute] << (options[:message] || I18n.t("validations.trailing_whitespace")) if value =~ /\s\z/ - 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