Merge branch 'master' into registrar-portal

This commit is contained in:
Martin Lensment 2015-03-20 11:12:59 +02:00
commit e2507f8661
3 changed files with 3 additions and 3 deletions

View file

@ -207,7 +207,7 @@ class Epp::Domain < Domain
if action != 'rem' if action != 'rem'
if x['type'] == 'admin' && c.bic? if x['type'] == 'admin' && c.bic?
add_epp_error('2306', 'contact', x.text, [:domain_contacts, :admin_contact_can_be_only_citizen]) add_epp_error('2306', 'contact', x.text, [:domain_contacts, :admin_contact_can_be_only_private_person])
next next
end end
end end

View file

@ -68,7 +68,7 @@ en:
domain_contacts: domain_contacts:
invalid: 'Contacts are invalid' invalid: 'Contacts are invalid'
not_found: 'Contact was not found' not_found: 'Contact was not found'
admin_contact_can_be_only_citizen: 'Admin contact can be only citizen' admin_contact_can_be_only_private_person: 'Admin contact can be only private person'
admin_contacts: admin_contacts:
out_of_range: 'Admin contacts count must be between %{min}-%{max}' out_of_range: 'Admin contacts count must be between %{min}-%{max}'
less_than_or_equal_to: 'Admin contacts count must be less than or equal to %{count}' less_than_or_equal_to: 'Admin contacts count must be less than or equal to %{count}'

View file

@ -691,7 +691,7 @@ describe 'EPP Domain', epp: true do
}) })
response = epp_plain_request(xml, :xml) response = epp_plain_request(xml, :xml)
response[:msg].should == 'Admin contact can be only citizen' response[:msg].should == 'Admin contact can be only private person'
response[:result_code].should == '2306' response[:result_code].should == '2306'
end end
end end