Improve readability

This commit is contained in:
Artur Beljajev 2019-04-09 14:42:19 +03:00
parent 37d744bb3c
commit 875a00f863
6 changed files with 14 additions and 14 deletions

View file

@ -3,7 +3,7 @@ class DomainDeleteConfirmEmailJob < Que::Job
domain = Domain.find(domain_id) domain = Domain.find(domain_id)
log(domain) log(domain)
DomainDeleteMailer.confirm(domain: domain, DomainDeleteMailer.confirmation(domain: domain,
registrar: domain.registrar, registrar: domain.registrar,
registrant: domain.registrant).deliver_now registrant: domain.registrant).deliver_now
end end

View file

@ -3,10 +3,10 @@ class DomainDeleteMailer < ApplicationMailer
%w[private_person legal_person] %w[private_person legal_person]
end end
def confirm(domain:, registrar:, registrant:) def confirmation(domain:, registrar:, registrant:)
@domain = DomainPresenter.new(domain: domain, view: view_context) @domain = DomainPresenter.new(domain: domain, view: view_context)
@registrar = RegistrarPresenter.new(registrar: registrar, 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) subject = default_i18n_subject(domain_name: domain.name)
mail(to: registrant.email, subject: subject) mail(to: registrant.email, subject: subject)
@ -28,7 +28,7 @@ class DomainDeleteMailer < ApplicationMailer
private private
def confirm_url(domain) def confirmation_url(domain)
registrant_domain_delete_confirm_url(domain, token: domain.registrant_verification_token) registrant_domain_delete_confirm_url(domain, token: domain.registrant_verification_token)
end end
end end

View file

@ -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. Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan.
<br><br> <br><br>
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.<br> 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.<br>
<%= link_to @confirm_url, @confirm_url %> <%= link_to @confirmation_url, @confirmation_url %>
<br><br> <br><br>
Lugupidamisega<br> Lugupidamisega<br>
Eesti Interneti Sihtasutus Eesti Interneti Sihtasutus
@ -23,7 +23,7 @@ Application for deletion of your domain <%= @domain.name %> has been filed. Plea
<br><br> <br><br>
To confirm the update please visit this website, once again review the data and press approve:<br> To confirm the update please visit this website, once again review the data and press approve:<br>
<%= link_to @confirm_url, @confirm_url %> <%= link_to @confirmation_url, @confirmation_url %>
<br><br> <br><br>
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. 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.
<br><br> <br><br>

View file

@ -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. 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. 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 Lugupidamisega
Eesti Interneti Sihtasutus 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 %> <%= 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: 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. 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.

View file

@ -1,6 +1,6 @@
en: en:
domain_delete_mailer: domain_delete_mailer:
confirm: confirmation:
subject: Kinnitustaotlus domeeni %{domain_name} kustutamiseks .ee registrist / Application for approval for deletion of %{domain_name} subject: Kinnitustaotlus domeeni %{domain_name} kustutamiseks .ee registrist / Application for approval for deletion of %{domain_name}
forced: forced:
subject: >- subject: >-

View file

@ -15,7 +15,7 @@ class DomainDeleteMailerTest < ActiveSupport::TestCase
def test_delivers_domain_delete_confirmation_email def test_delivers_domain_delete_confirmation_email
assert_equal 'shop.test', @domain.name assert_equal 'shop.test', @domain.name
email = DomainDeleteMailer.confirm(domain: @domain, email = DomainDeleteMailer.confirmation(domain: @domain,
registrar: @domain.registrar, registrar: @domain.registrar,
registrant: @domain.registrant).deliver_now registrant: @domain.registrant).deliver_now