diff --git a/app/controllers/registrant/domains_controller.rb b/app/controllers/registrant/domains_controller.rb index 14a961aba..18c29abb0 100644 --- a/app/controllers/registrant/domains_controller.rb +++ b/app/controllers/registrant/domains_controller.rb @@ -26,7 +26,7 @@ class Registrant::DomainsController < RegistrantController dom.pending_json.present? @domain = dom - confirm_path = "#{ENV['registrant_url']}/registrant/domain_update_confirms" + confirm_path = get_confirm_path(dom.statuses) @verification_url = "#{confirm_path}/#{@domain.id}?token=#{@domain.registrant_verification_token}" else @@ -74,4 +74,13 @@ class Registrant::DomainsController < RegistrantController yield params[:q][:valid_to_lteq] = ca_cache end + + def get_confirm_path(statuses) + if statuses.include?(DomainStatus::PENDING_UPDATE) + "#{ENV['registrant_url']}/registrant/domain_update_confirms" + elsif statuses.include?(DomainStatus::PENDING_DELETE) + "#{ENV['registrant_url']}/registrant/domain_delete_confirms" + end + end + end \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 1f9017310..63959319e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -932,10 +932,14 @@ en: if_auth_info_is_left_empty_it_will_be_auto_generated: 'If auth info is left empty, it will be auto generated.' each_domain_name_must_end_with_colon_sign: 'Each domain name must end with colon (:) sign.' expiration_remind_subject: 'The %{name} domain has expired' + personal_domain_verification_url: 'Personal domain verification url' + available_verification_url_not_found: 'Available verification url not found, for domain.' + contact_already_associated_with_the_domain: 'Object association prohibits operation, contact already associated with the domain' add_reserved_domain: 'Add domain to reserved list' add_blocked_domain: 'Add domain to blocked list' edit_pw: 'Edit Pw' optional: 'Optional' - contact_already_associated_with_the_domain: 'Object association prohibits operation, contact already associated with the domain' +======= personal_domain_verification_url: 'Personal domain verification url' available_verification_url_not_found: 'Available verification url not found, for domain.' +>>>>>>> Temporary merge branch 2