diff --git a/app/models/dnskey.rb b/app/models/dnskey.rb index 6742696b2..348bddde7 100644 --- a/app/models/dnskey.rb +++ b/app/models/dnskey.rb @@ -34,9 +34,12 @@ class Dnskey < ApplicationRecord def epp_code_map { '2005' => [ - [:alg, :invalid, { value: { obj: 'alg', val: alg }, values: ALGORITHMS.join(', ') }], - [:protocol, :invalid, { value: { obj: 'protocol', val: protocol }, values: PROTOCOLS.join(', ') }], - [:flags, :invalid, { value: { obj: 'flags', val: flags }, values: FLAGS.join(', ') }] + [:alg, :invalid, { value: { obj: 'alg', val: alg }, + values: "Valid algorithms are: #{ALGORITHMS.join(', ')}" }], + [:protocol, :invalid, { value: { obj: 'protocol', val: protocol }, + values: "Valid protocols are: #{PROTOCOLS.join(', ')}" }], + [:flags, :invalid, { value: { obj: 'flags', val: flags }, + values: "Valid protocols are: #{PROTOCOLS.join(', ')}" }], ], '2302' => [ [:public_key, :taken, { value: { obj: 'pubKey', val: public_key } }] @@ -60,7 +63,7 @@ class Dnskey < ApplicationRecord def validate_algorithm return if alg.blank? return if ALGORITHMS.include?(alg.to_s) - errors.add(:alg, :invalid, values: "#{ALGORITHMS.join(', ')}") + errors.add(:alg, :invalid, values: "Valid algorithms are: #{ALGORITHMS.join(', ')}") end def validate_protocol diff --git a/config/locales/en.yml b/config/locales/en.yml index a28d97f81..8ba570e6c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -123,7 +123,7 @@ en: dnskey: attributes: alg: - invalid: 'Valid algorithms are: %{values}' + invalid: '%{values}' blank: 'Algorithm is missing' protocol: invalid: 'Valid protocols are: %{values}'