From 684b8bf0d9db8ea795470d906fe3cecb734bf78d Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 27 May 2016 16:43:23 +0300 Subject: [PATCH] 114677695-error_text_change --- app/models/nameserver.rb | 4 ++-- config/locales/en.yml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/nameserver.rb b/app/models/nameserver.rb index ee6684d12..9ca1bebf7 100644 --- a/app/models/nameserver.rb +++ b/app/models/nameserver.rb @@ -28,7 +28,7 @@ class Nameserver < ActiveRecord::Base ], '2005' => [ [:hostname, :invalid, { value: { obj: 'hostAttr', val: hostname } }], - [:hostname_puny, :puny_to_long, { value: { obj: 'hostAttr', val: hostname } }], + [:hostname, :puny_to_long, { value: { obj: 'hostAttr', val: hostname } }], [:ipv4, :invalid, { value: { obj: 'hostAddr', val: ipv4 } }], [:ipv6, :invalid, { value: { obj: 'hostAddr', val: ipv6 } }] ], @@ -46,7 +46,7 @@ class Nameserver < ActiveRecord::Base def check_label_length hostname_puny.split('.').each do |label| - errors.add(:hostname_puny, :puny_to_long) if label.length > 63 + errors.add(:hostname, :puny_to_long) if label.length > 63 end end diff --git a/config/locales/en.yml b/config/locales/en.yml index b90f62bc0..e01451d60 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -131,8 +131,7 @@ en: hostname: invalid: 'Hostname is invalid' taken: 'Nameserver already exists on this domain' - hostname_puny: - puny_to_long: 'Hostname puny is too long (maximum is 63 characters)' + puny_to_long: 'Hostname puny label is too long (maximum is 63 characters)' ipv4: blank: 'IPv4 is missing' invalid: 'IPv4 is invalid'