zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 17:59:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '117124725-rant-pending-messages' into staging

Browse source 
Fixed incorrect pendingDeleteConfirmation reject and confirm messages
This commit is contained in:
Timo Võhmar 2016-04-15 11:11:23 +03:00
commit 1ae51213ec
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/registrant/domain_delete_confirms_controller.rb
View file

@ -22,18 +22,18 @@ class Registrant::DomainDeleteConfirmsController < RegistrantController
verification_token: params[:token]) verification_token: params[:token])
if params[:rejected] if params[:rejected]
if @registrant_verification.domain_registrant_delete_reject! if @registrant_verification.domain_registrant_delete_reject!
flash[:notice] = t(:registrant_domain_verification_rejected) flash[:notice] = t(:registrant_domain_delete_rejected)
redirect_to registrant_domain_delete_confirm_path(@domain.id, rejected: true) redirect_to registrant_domain_delete_confirm_path(@domain.id, rejected: true)
else else
flash[:alert] = t(:registrant_domain_verification_rejected_failed) flash[:alert] = t(:registrant_domain_delete_rejected_failed)
return render 'show' return render 'show'
end end
elsif params[:confirmed] elsif params[:confirmed]
if @registrant_verification.domain_registrant_delete_confirm! if @registrant_verification.domain_registrant_delete_confirm!
flash[:notice] = t(:registrant_domain_verification_confirmed) flash[:notice] = t(:registrant_domain_delete_confirmed)
redirect_to registrant_domain_delete_confirm_path(@domain.id, confirmed: true) redirect_to registrant_domain_delete_confirm_path(@domain.id, confirmed: true)
else else
flash[:alert] = t(:registrant_domain_verification_confirmed_failed) flash[:alert] = t(:registrant_domain_delete_confirmed_failed)
return render 'show' return render 'show'
end end
end end

6
config/locales/en.yml
View file

@ -828,10 +828,14 @@ en:
domain_registrant_change_rejected_body: 'You have rejected domain registrant change. You will receive confirmation by email.' domain_registrant_change_rejected_body: 'You have rejected domain registrant change. You will receive confirmation by email.'
registrant_domain_verification_rejected: 'Domain registrant change has been rejected successfully.' registrant_domain_verification_rejected: 'Domain registrant change has been rejected successfully.'
registrant_domain_verification_rejected_failed: 'Something went wrong.' registrant_domain_verification_rejected_failed: 'Something went wrong.'
domain_delete_title: 'Please confirm or reject domain deletation' domain_delete_title: 'Please confirm or reject domain deletion'
domain_delete_body: 'There is a request to delete a domain. Before doing it we need your confirmation.' domain_delete_body: 'There is a request to delete a domain. Before doing it we need your confirmation.'
registrant_domain_delete_confirmed: 'Setting the domain up for deletion...'
registrant_domain_delete_confirmed_failed: 'Something went wrong.'
domain_delete_confirmed_title: 'Domain deletion has been received successfully' domain_delete_confirmed_title: 'Domain deletion has been received successfully'
domain_delete_confirmed_body: 'You have successfully submitted delete confirmation. You will receive registry final confirmation to email.' domain_delete_confirmed_body: 'You have successfully submitted delete confirmation. You will receive registry final confirmation to email.'
registrant_domain_delete_rejected: 'Rejecting the domain deletion...'
registrant_domain_delete_rejected_failed: 'Something went wrong.'
domain_delete_rejected_title: 'Domain deletion rejection has been received successfully' domain_delete_rejected_title: 'Domain deletion rejection has been received successfully'
domain_delete_rejected_body: 'You have rejected pending domain deletion. You will receive confirmation by email.' domain_delete_rejected_body: 'You have rejected pending domain deletion. You will receive confirmation by email.'
no_permission: 'No permission' no_permission: 'No permission'