Merge branch 'master' into registry-790

# Conflicts:
#	test/models/domain/force_delete_test.rb
#	test/system/admin_area/domains/force_delete_test.rb
This commit is contained in:
Artur Beljajev 2018-08-24 14:54:41 +03:00
commit 4b2948986b
5 changed files with 43 additions and 34 deletions

View file

@ -50,7 +50,7 @@ en:
force_delete_toggle_btn:
schedule: Schedule force delete
unable_to_schedule: >
Force delete procedure cannot be scheduled while a domain has deleteCandidate status
cancel: Cancel force delete
cancel_confirm: Are you sure you want cancel force delete procedure?
unable_to_cancel: >
Force delete procedure cannot be cancelled while a domain has deleteCandidate status
cancel_confirm: Are you sure you want cancel force delete procedure?