zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-11 23:24:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improve readability

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
app/jobs/domain_delete_confirm_email_job.rb
View file

@ -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

6
app/mailers/domain_delete_mailer.rb
View file

@ -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

4
app/views/mailers/domain_delete_mailer/confirm.html.erb → app/views/mailers/domain_delete_mailer/confirmation.html.erb
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.
<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>
<%= link_to @confirm_url, @confirm_url %>
<%= link_to @confirmation_url, @confirmation_url %>
<br><br>
Lugupidamisega<br>
Eesti Interneti Sihtasutus
@ -23,7 +23,7 @@ Application for deletion of your domain <%= @domain.name %> has been filed. Plea
<br><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>
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>

4
app/views/mailers/domain_delete_mailer/confirm.text.erb → app/views/mailers/domain_delete_mailer/confirmation.text.erb
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.
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.

2
config/locales/mailers/domain_delete.en.yml
View file

@ -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: >-

6
test/mailers/domain_delete_mailer_test.rb
View file

@ -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' \