diff --git a/app/jobs/domain_delete_confirm_email_job.rb b/app/jobs/domain_delete_confirm_email_job.rb
index d2f2911e3..fafe143e1 100644
--- a/app/jobs/domain_delete_confirm_email_job.rb
+++ b/app/jobs/domain_delete_confirm_email_job.rb
@@ -3,9 +3,9 @@ class DomainDeleteConfirmEmailJob < Que::Job
domain = Domain.find(domain_id)
log(domain)
- DomainDeleteMailer.confirm(domain: domain,
- registrar: domain.registrar,
- registrant: domain.registrant).deliver_now
+ DomainDeleteMailer.confirmation(domain: domain,
+ registrar: domain.registrar,
+ registrant: domain.registrant).deliver_now
end
private
diff --git a/app/mailers/domain_delete_mailer.rb b/app/mailers/domain_delete_mailer.rb
index aa4d38533..46ad963fb 100644
--- a/app/mailers/domain_delete_mailer.rb
+++ b/app/mailers/domain_delete_mailer.rb
@@ -3,10 +3,10 @@ class DomainDeleteMailer < ApplicationMailer
%w[private_person legal_person]
end
- def confirm(domain:, registrar:, registrant:)
+ def confirmation(domain:, registrar:, registrant:)
@domain = DomainPresenter.new(domain: domain, view: view_context)
@registrar = RegistrarPresenter.new(registrar: registrar, view: view_context)
- @confirm_url = confirm_url(domain)
+ @confirmation_url = confirmation_url(domain)
subject = default_i18n_subject(domain_name: domain.name)
mail(to: registrant.email, subject: subject)
@@ -28,7 +28,7 @@ class DomainDeleteMailer < ApplicationMailer
private
- def confirm_url(domain)
+ def confirmation_url(domain)
registrant_domain_delete_confirm_url(domain, token: domain.registrant_verification_token)
end
end
diff --git a/app/views/mailers/domain_delete_mailer/confirm.html.erb b/app/views/mailers/domain_delete_mailer/confirmation.html.erb
similarity index 92%
rename from app/views/mailers/domain_delete_mailer/confirm.html.erb
rename to app/views/mailers/domain_delete_mailer/confirmation.html.erb
index e62890ed1..f6754ff5c 100644
--- a/app/views/mailers/domain_delete_mailer/confirm.html.erb
+++ b/app/views/mailers/domain_delete_mailer/confirmation.html.erb
@@ -8,7 +8,7 @@ Registrisse laekus taotlus domeeni <%= @domain.name %> kustutamiseks. Palun veen
Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan.
Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ise ei kinnita või tagasi lükka.
-<%= link_to @confirm_url, @confirm_url %>
+<%= link_to @confirmation_url, @confirmation_url %>
Lugupidamisega
Eesti Interneti Sihtasutus
@@ -23,7 +23,7 @@ Application for deletion of your domain <%= @domain.name %> has been filed. Plea
To confirm the update please visit this website, once again review the data and press approve:
-<%= link_to @confirm_url, @confirm_url %>
+<%= link_to @confirmation_url, @confirmation_url %>
The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automatically rejected if it is not approved nor rejected before.
diff --git a/app/views/mailers/domain_delete_mailer/confirm.text.erb b/app/views/mailers/domain_delete_mailer/confirmation.text.erb
similarity index 96%
rename from app/views/mailers/domain_delete_mailer/confirm.text.erb
rename to app/views/mailers/domain_delete_mailer/confirmation.text.erb
index 7d2e1cb05..b1dddd773 100644
--- a/app/views/mailers/domain_delete_mailer/confirm.text.erb
+++ b/app/views/mailers/domain_delete_mailer/confirmation.text.erb
@@ -7,7 +7,7 @@ Registrisse laekus taotlus domeeni <%= @domain.name %> kustutamiseks. Palun veen
Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan.
Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ise ei kinnita või tagasi lükka.
-<%= @confirm_url %>
+<%= @confirmation_url %>
Lugupidamisega
Eesti Interneti Sihtasutus
@@ -21,7 +21,7 @@ Application for deletion of your domain <%= @domain.name %> has been filed. Plea
<%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %>
To confirm the update please visit this website, once again review the data and press approve:
-<%= @confirm_url %>
+<%= @confirmation_url %>
The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automatically rejected if it is not approved nor rejected before.
diff --git a/config/locales/mailers/domain_delete.en.yml b/config/locales/mailers/domain_delete.en.yml
index 57bf126bf..5191f4da2 100644
--- a/config/locales/mailers/domain_delete.en.yml
+++ b/config/locales/mailers/domain_delete.en.yml
@@ -1,6 +1,6 @@
en:
domain_delete_mailer:
- confirm:
+ confirmation:
subject: Kinnitustaotlus domeeni %{domain_name} kustutamiseks .ee registrist / Application for approval for deletion of %{domain_name}
forced:
subject: >-
diff --git a/test/mailers/domain_delete_mailer_test.rb b/test/mailers/domain_delete_mailer_test.rb
index a7a134fed..021768399 100644
--- a/test/mailers/domain_delete_mailer_test.rb
+++ b/test/mailers/domain_delete_mailer_test.rb
@@ -15,9 +15,9 @@ class DomainDeleteMailerTest < ActiveSupport::TestCase
def test_delivers_domain_delete_confirmation_email
assert_equal 'shop.test', @domain.name
- email = DomainDeleteMailer.confirm(domain: @domain,
- registrar: @domain.registrar,
- registrant: @domain.registrant).deliver_now
+ email = DomainDeleteMailer.confirmation(domain: @domain,
+ registrar: @domain.registrar,
+ registrant: @domain.registrant).deliver_now
assert_emails 1
assert_equal 'Kinnitustaotlus domeeni shop.test kustutamiseks .ee registrist' \