Refactor mailer views

#180
This commit is contained in:
Artur Beljajev 2016-11-10 23:32:52 +02:00
parent eac7690345
commit 789468c84f
32 changed files with 334 additions and 346 deletions

View file

@ -3,7 +3,8 @@ Lugupeetud .ee domeeni kasutaja<br>
<br>
Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
<br><br>
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja <%= @registrar.name %> poole. Registripidajate kontaktid leiate aadressilt www.internet.ee/registripidajad.
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja:
<%= render 'mailers/domain_mailer/registrar/registrar.et.html', registrar: @registrar %>
<br><br>
Domeeni <%= @domain.name %> kohta on registris järgmised andmed:
<br><br>
@ -12,11 +13,6 @@ Halduskontakt: <%= @domain.admin_contact_names %><br>
Tehniline kontakt: <%= @domain.tech_contact_names %><br>
Nimeserverid: <%= @domain.nameserver_names %><br>
<p>Registripidaja:<br>
<%= @registrar.name %><br>
Email: <%= @registrar.email %><br>
Telefon: <%= @registrar.phone %><br>
Veebileht: <%= @registrar.url %></p>
Ülevaate kõikidest endaga seotud domeenidest saate registreerija portaalist. <%= ENV['registrant_url'] %>.<br>
<br><br>
@ -30,7 +26,8 @@ Dear user of .ee domain,<br>
<br>
The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>. From <%= @domain.delete_date %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
<br><br>
To renew the domain registration, please contact your registrar <%= @registrar.name %>. You can find the registrar's contacts at http://internet.ee/registrars.
To renew the domain registration, please contact your registrar:
<%= render 'mailers/domain_mailer/registrar/registrar.en.html', registrar: @registrar %>
<br><br>
The following data for the <%= @domain.name %> domain have been entered into the registry:
<br><br>
@ -39,11 +36,6 @@ Administrative contact: <%= @domain.admin_contact_names %><br>
Technical contact: <%= @domain.tech_contact_names %><br>
Name servers: <%= @domain.nameserver_names %><br>
<p>Registrar:<br>
<%= @registrar.name %><br>
Email: <%= @registrar.email %><br>
Phone: <%= @registrar.phone %><br>
Website: <%= @registrar.url %></p>
You can find an overview of all your domains at the registrant's portal. <%= ENV['registrant_url'] %>.<br>
<br><br>
@ -60,7 +52,8 @@ Estonian Internet Foundation
<br><br>
Для продления регистрации домена просим обратиться к своему регистратору <%= @registrar.name %>. Контактные данные регистраторов можно найти по адресу http://internet.ee/registratory.
Для продления регистрации домена просим обратиться к своему регистратору:
<%= render 'mailers/domain_mailer/registrar/registrar.ru.html', registrar: @registrar %>
<br><br>
Относительно домена <%= @domain.name %> в реестр внесены следующие данные:
@ -71,11 +64,6 @@ Estonian Internet Foundation
Технический контакт: <%= @domain.tech_contact_names %><br>
Серверы доменных имен: <%= @domain.nameserver_names %><br>
<p>Регистратор:<br>
<%= @registrar.name %><br>
Электронная почта: <%= @registrar.email %><br>
Телефон: <%= @registrar.phone %><br>
Веб-сайт: <%= @registrar.url %></p>
Обзор всех связанных с Вами доменов можете получить на портале регистранта. <%= ENV['registrant_url'] %>.<br>

View file

@ -3,7 +3,9 @@ Lugupeetud .ee domeeni kasutaja
Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja <%= @registrar.name %> poole. Registripidajate kontaktid leiate aadressilt www.internet.ee/registripidajad.
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja:
<%= render 'mailers/domain_mailer/registrar/registrar.et.text', registrar: @registrar %>
Domeeni <%= @domain.name %> kohta on registris järgmised andmed:
@ -12,12 +14,6 @@ Halduskontakt: <%= @domain.admin_contact_names %>
Tehniline kontakt: <%= @domain.tech_contact_names %>
Nimeserverid: <%= @domain.nameserver_names %>
Registripidaja:
<%= @registrar.name %>
Email: <%= @registrar.email %>
Telefon: <%= @registrar.phone %>
Veebileht: <%= @registrar.url %>
Ülevaate kõikidest endaga seotud domeenidest saate registreerija portaalist. <%= ENV['registrant_url'] %>.
Parimate soovidega
@ -30,7 +26,9 @@ Dear user of .ee domain,
The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>. From <%= @domain.delete_date %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
To renew the domain registration, please contact your registrar <%= @registrar.name %>. You can find the registrar's contacts at http://internet.ee/registrars.
To renew the domain registration, please contact your registrar:
<%= render 'mailers/domain_mailer/registrar/registrar.en.text', registrar: @registrar %>
The following data for the <%= @domain.name %> domain have been entered into the registry:
@ -39,12 +37,6 @@ Administrative contact: <%= @domain.admin_contact_names %>
Technical contact: <%= @domain.tech_contact_names %>
Name servers: <%= @domain.nameserver_names %>
Registrar:
<%= @registrar.name %>
Email: <%= @registrar.email %>
Phone: <%= @registrar.phone %>
Website: <%= @registrar.url %>
You can find an overview of all your domains at the registrant's portal. <%= ENV['registrant_url'] %>.
Best Regards,
@ -57,21 +49,17 @@ Estonian Internet Foundation
Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете. С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
Для продления регистрации домена просим обратиться к своему регистратору <%= @registrar.name %>. Контактные данные регистраторов можно найти по адресу http://internet.ee/registratory.
Для продления регистрации домена просим обратиться к своему регистратору:
Относительно домена <%= @domain %> в реестр внесены следующие данные:
<%= render 'mailers/domain_mailer/registrar/registrar.ru.text', registrar: @registrar %>
Относительно домена <%= @domain.name %> в реестр внесены следующие данные:
Регистрант: <%= @domain.registrant_name %>
Административный контакт: <%= @domain.admin_contact_names %>
Технический контакт: <%= @domain.tech_contact_names %>
Серверы доменных имен: <%= @domain.nameserver_names %>
Регистратор:
<%= @registrar.name %>
Электронная почта: <%= @registrar.email %>
Телефон: <%= @registrar.phone %>
Веб-сайт: <%= @registrar.url %>
Обзор всех связанных с Вами доменов можете получить на портале регистранта. <%= ENV['registrant_url'] %>.
С наилучшими пожеланиями

View file

@ -2,12 +2,7 @@ Tere
<br><br>
Registrisse laekus taotlus domeeni <%= @domain.name %> kustutamiseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole:
<p>
<%= @registrar.name %><br>
Email: <%= @registrar.email %><br>
Telefon: <%= @registrar.phone %><br>
Veebileht: <%= @registrar.url %>
</p>
<%= render 'mailers/domain_mailer/registrar/registrar.et.html', registrar: @registrar %>
<br><br>
Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan.
@ -24,12 +19,7 @@ Hi,
<br><br>
Application for deletion of your domain <%= @domain.name %> has been filed. Please make sure that the application is correct. Incase of problems please contact your registrar:
<p>
<%= @registrar.name %><br>
Email: <%= @registrar.email %><br>
Phone: <%= @registrar.phone %><br>
Website: <%= @registrar.url %>
</p>
<%= render 'mailers/domain_mailer/registrar/registrar.en.html', registrar: @registrar %>
<br><br>
To confirm the update please visit this website, once again review the data and press approve:<br>

View file

@ -2,10 +2,7 @@ Tere
Registrisse laekus taotlus domeeni <%= @domain.name %> kustutamiseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole:
<%= @registrar.name %>
Email: <%= @registrar.email %>
Telefon: <%= @registrar.phone %>
Veebileht: <%= @registrar.url %>
<%= render 'mailers/domain_mailer/registrar/registrar.et.text', registrar: @registrar %>
Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan.
@ -21,10 +18,7 @@ Hi,
Application for deletion of your domain <%= @domain.name %> has been filed. Please make sure that the application is correct. In case of problems please contact your registrar:
<%= @registrar.name %>
Email: <%= @registrar.email %>
Phone: <%= @registrar.phone %>
Website: <%= @registrar.url %>
<%= render 'mailers/domain_mailer/registrar/registrar.en.text', registrar: @registrar %>
To confirm the update please visit this website, once again review the data and press approve:
<%= @verification_url %>

View file

@ -1,8 +1,11 @@
Tere
<br><br>
Domeeni <%= @params[:name] %> registreerija <%= @params[:registrant_name] %> ei kinnitanud tähtaegselt registreerija vahetuse taotlust. Domeeni <%= @params[:name] %> registreerija vahetus on sellest tulenevalt tühistatud.
Domeeni <%= @domain.name %> registreerija <%= @registrant.name %> ei kinnitanud tähtaegselt registreerija vahetuse taotlust. Domeeni <%= @domain.name %> registreerija vahetus on sellest tulenevalt tühistatud.
<br><br>
Küsimuste korral palun võtke ühendust oma registripidajaga <%= @params[:registrar_name] %>. Registripidajate kontaktid leiate aadressilt www.internet.ee/registripidajad.
Küsimuste korral palun võtke ühendust oma registripidajaga:
<%= render 'registrar.et.html', registrar: @registrar %>
<br><br>
Lugupidamisega<br>
Eesti Interneti Sihtasutus
@ -11,9 +14,12 @@ Eesti Interneti Sihtasutus
<br><br>
Hi,
<br><br>
Domain registrant change request has been expired for the domain <%= @params[:name] %>.
Domain registrant change request has been expired for the domain <%= @domain.name %>.
<br><br>
Please contact to your registrar <%= @params[:registrar_name] %> if you have any questions. You can find the registrar's contacts at http://internet.ee/registrars.
Please contact to your registrar if you have any questions:
<%= render 'registrar.en.html', registrar: @registrar %>
<br><br>
Best Regards,<br>
Estonian Internet Foundation

View file

@ -1,8 +1,10 @@
Tere
Domeeni <%= @params[:name] %> registreerija <%= @params[:registrant_name] %> ei kinnitanud tähtaegselt registreerija vahetuse taotlust. Domeeni <%= @params[:name] %> registreerija vahetus on sellest tulenevalt tühistatud.
Domeeni <%= @domain.name %> registreerija <%= @registrant.name %> ei kinnitanud tähtaegselt registreerija vahetuse taotlust. Domeeni <%= @domain.name %> registreerija vahetus on sellest tulenevalt tühistatud.
Küsimuste korral palun võtke ühendust oma registripidajaga <%= @params[:registrar_name] %>. Registripidajate kontaktid leiate aadressilt www.internet.ee/registripidajad.
Küsimuste korral palun võtke ühendust oma registripidajaga:
<%= render 'registrar.et.text', registrar: @registrar %>
Lugupidamisega
Eesti Interneti Sihtasutus
@ -11,9 +13,11 @@ Eesti Interneti Sihtasutus
Hi,
Domain registrant change request has been expired for the domain <%= @params[:name] %>.
Domain registrant change request has been expired for the domain <%= @domain.name %>.
Please contact to your registrar <%= @params[:registrar_name] %> if you have any questions. You can find the registrar's contacts at http://internet.ee/registrars.
Please contact to your registrar if you have any questions:
<%= render 'registrar.en.text', registrar: @registrar %>
Best Regards,
Estonian Internet Foundation

View file

@ -1,25 +1,18 @@
Tere
<br><br>
Registripidaja <%= @params[:registrar_name] %> vahendusel on algatatud <%= @params[:name] %> domeeni omanikuvahetuse protseduur.
Registripidaja <%= @registrar.name %> vahendusel on algatatud <%= @domain.name %> domeeni omanikuvahetuse protseduur.
<br><br>
Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja <%= @params[:registrar_name] %> poole.
Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole:
<%= render 'registrar.et.html', registrar: @registrar %>
<br><br>
Uue registreerija andmed:<br>
Nimi: <%= @params[:registrant_name] %><br>
<% if @params[:registrant_priv] %>
Isikukood: <%= @params[:registrant_ident] %><br>
<% else %>
Äriregistrikood: <%= @params[:registrant_ident] %><br>
<% end %>
Tänav: <%= @params[:registrant_street] %><br>
Linn: <%= @params[:registrant_city] %><br>
Riik: <%= @params[:registrant_country] %>
<%= render 'registrant.et.html', registrant: @new_registrant %>
<br><br>
Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiakse lõpule vaid juhul, kui domeeni hetkel kehtiv registreerija <%= @params[:old_registrant_name] %> omanikuvahetuse tähtaegselt kinnitab.
Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiakse lõpule vaid juhul, kui domeeni hetkel kehtiv registreerija <%= @current_registrant.name %> omanikuvahetuse tähtaegselt kinnitab.
<br><br>
Juhul kui <%= @params[:old_registrant_name] %> lükkab omanikuvahetuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
<br><br>
Küsimuste korral palun võtke ühendust registripidajaga <%= @params[:registrar_name] %>. Registripidajate kontaktid leiate aadressilt www.internet.ee/registripidajad.
Juhul kui <%= @current_registrant.name %> lükkab omanikuvahetuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
<br><br>
Lugupidamisega<br>
Eesti Interneti Sihtasutus
@ -28,26 +21,19 @@ Eesti Interneti Sihtasutus
<br><br>
Hi,
<br><br>
Registrant change process for the domain <%= @params[:name] %> has been started.
Registrant change process for the domain <%= @domain.name %> has been started.
<br><br>
Please verify the details of the following change request. In case of problems contact your registrar <%= @params[:registrar_name] %>
Please verify the details of the following change request. In case of problems contact your registrar:
<%= render 'registrar.en.html', registrar: @registrar %>
<br><br>
New registrant:<br>
Name: <%= @params[:registrant_name] %><br>
<% if @params[:registrant_priv] %>
Personal code: <%= @params[:registrant_ident] %><br>
<% else %>
Business Registry code: <%= @params[:registrant_ident] %><br>
<% end %>
Street: <%= @params[:registrant_street] %><br>
City: <%= @params[:registrant_city] %><br>
Country: <%= @params[:registrant_country] %>
<%= render 'registrant.en.html', registrant: @new_registrant %>
<br><br>
The registrant change procedure will be completed only after the current registrant <%= @params[:old_registrant_name] %> has approved it.
The registrant change procedure will be completed only after the current registrant <%= @current_registrant.name %> has approved it.
<br><br>
Change request will be cancelled in case <%= @params[:old_registrant_name] %> rejects or does not approve it in <%= Setting.expire_pending_confirmation %> hours.
<br><br>
Please contact registrar <%= @params[:registrar_name] %> in case of questions. You can find the registrar's contacts at http://internet.ee/registrars.
Change request will be cancelled in case <%= @current_registrant.name %> rejects or does not approve it in <%= Setting.expire_pending_confirmation %> hours.
<br><br>
Best Regards,<br>
Estonian Internet Foundation

View file

@ -1,25 +1,17 @@
Tere
Registripidaja <%= @params[:registrar_name] %> vahendusel on algatatud <%= @params[:name] %> domeeni omanikuvahetuse protseduur.
Registripidaja <%= @registrar.name %> vahendusel on algatatud <%= @domain.name %> domeeni omanikuvahetuse protseduur.
Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja <%= @params[:registrar_name] %> poole.
Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole:
<%= render 'registrar.et.text', registrar: @registrar %>
Uue registreerija andmed:
Nimi: <%= @params[:registrant_name] %>
<% if @params[:registrant_priv] %>
Isikukood: <%= @params[:registrant_ident] %>
<% else %>
Äriregistrikood: <%= @params[:registrant_ident] %>
<% end %>
Tänav: <%= @params[:registrant_street] %>
Linn: <%= @params[:registrant_city] %>
Riik: <%= @params[:registrant_country] %>
<%= render 'registrant.et.text', registrant: @new_registrant %>
Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiakse lõpule vaid juhul, kui domeeni hetkel kehtiv registreerija <%= @params[:old_registrant_name] %> omanikuvahetuse tähtaegselt kinnitab.
Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiakse lõpule vaid juhul, kui domeeni hetkel kehtiv registreerija <%= @current_registrant.name %> omanikuvahetuse tähtaegselt kinnitab.
Juhul kui <%= @params[:old_registrant_name] %> lükkab omanikuvahetuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
Küsimuste korral palun võtke ühendust registripidajaga <%= @params[:registrar_name] %>. Registripidajate kontaktid leiate aadressilt www.internet.ee/registripidajad.
Juhul kui <%= @current_registrant.name %> lükkab omanikuvahetuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
Lugupidamisega
Eesti Interneti Sihtasutus
@ -28,26 +20,18 @@ Eesti Interneti Sihtasutus
Hi,
Registrant change process for the domain <%= @params[:name] %> has been started.
Registrant change process for the domain <%= @domain.name %> has been started.
Please verify the details of the following change request. In case of problems contact your registrar <%= @params[:registrar_name] %>
Please verify the details of the following change request. In case of problems contact your registrar:
<%= render 'registrar.en.text', registrar: @registrar %>
New registrant:
Name: <%= @params[:registrant_name] %>
<% if @params[:registrant_priv] %>
Personal code: <%= @params[:registrant_ident] %>
<% else %>
Business Registry code: <%= @params[:registrant_ident] %>
<% end %>
Street: <%= @params[:registrant_street] %>
City: <%= @params[:registrant_city] %>
Country: <%= @params[:registrant_country] %>
<%= render 'registrant.en.text', registrant: @new_registrant %>
The registrant change procedure will be completed only after the current registrant <%= @params[:old_registrant_name] %> has approved it.
The registrant change procedure will be completed only after the current registrant <%= @current_registrant.name %> has approved it.
Change request will be cancelled in case <%= @params[:old_registrant_name] %> rejects or does not approve it in <%= Setting.expire_pending_confirmation %> hours.
Please contact registrar <%= @params[:registrar_name] %> in case of questions. You can find the registrar's contacts at http://internet.ee/registrars.
Change request will be cancelled in case <%= @current_registrant.name %> rejects or does not approve it in <%= Setting.expire_pending_confirmation %> hours.
Best Regards,
Estonian Internet Foundation

View file

@ -1,8 +1,11 @@
Tere
<br><br>
Domeeni <%= @params[:name] %> registreerija <%= @params[:old_registrant_name] %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
Domeeni <%= @domain.name %> registreerija <%= @current_registrant.name %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
<br><br>
Küsimuste korral võtke palun ühendust oma registripidajaga <%= @params[:registrar_name] %>. Registripidajate kontaktid leiate aadressilt www.internet.ee/registripidajad.
Küsimuste korral võtke palun ühendust oma registripidajaga:
<%= render 'registrar.et.html', registrar: @registrar %>
<br><br>
Lugupidamisega<br>
Eesti Interneti Sihtasutus
@ -11,9 +14,12 @@ Eesti Interneti Sihtasutus
<br><br>
Hi,
<br><br>
Registrant change for the domain <%= @params[:name] %> was rejected by the registrant <%= @params[:old_registrant_name] %>.
Registrant change for the domain <%= @domain.name %> was rejected by the registrant <%= @current_registrant.name %>.
<br><br>
Please contact your registrar <%= @params[:registrar_name] %> if you have any questions. You can find the registrar's contacts at http://internet.ee/registrars.
Please contact your registrar if you have any questions:
<%= render 'registrar.en.html', registrar: @registrar %>
<br><br>
Best Regards,<br>
Estonian Internet Foundation

View file

@ -1,8 +1,10 @@
Tere
Domeeni <%= @params[:name] %> registreerija <%= @params[:old_registrant_name] %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
Domeeni <%= @domain.name %> registreerija <%= @current_registrant.name %> on domeeni registreerija vahetamise taotluse tagasi lükanud.
Küsimuste korral võtke palun ühendust oma registripidajaga <%= @params[:registrar_name] %>. Registripidajate kontaktid leiate aadressilt www.internet.ee/registripidajad.
Küsimuste korral võtke palun ühendust oma registripidajaga:
<%= render 'registrar.et.text', registrar: @registrar %>
Lugupidamisega
Eesti Interneti Sihtasutus
@ -11,10 +13,11 @@ Eesti Interneti Sihtasutus
Hi,
Registrant change for the domain <%= @params[:name] %> was rejected by the registrant <%= @params[:old_registrant_name] %>
.
Registrant change for the domain <%= @domain.name %> was rejected by the registrant <%= @current_registrant.name %>.
Please contact your registrar <%= @params[:registrar_name] %> if you have any questions. You can find the registrar's contacts at http://internet.ee/registrars.
Please contact your registrar if you have any questions:
<%= render 'registrar.en.text', registrar: @registrar %>
Best Regards,
Estonian Internet Foundation

View file

@ -2,24 +2,11 @@ Tere
<br><br>
Registrisse laekus taotlus domeeni <%= @domain.name %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole:
<p>
<%= @registrar.name %><br>
Email: <%= @registrar.email %><br>
Telefon: <%= @registrar.phone %><br>
Veebileht: <%= @registrar.url %>
</p>
<%= render 'registrar.et.html', registrar: @registrar %>
<br><br>
Uue registreerija andmed:<br>
Nimi: <%= @registrant.name %><br>
<% if @registrant.priv? %>
Isikukood: <%= @registrant.ident %><br>
<% else %>
Äriregistrikood: <%= @registrant.ident %><br>
<% end %>
Tänav: <%= @registrant.street %><br>
Linn: <%= @registrant.city %><br>
Riik: <%= @registrant.country %>
<%= render 'registrant.et.html', registrant: @registrant %>
<br><br>
Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ei kinnita või tagasi lükka.
<br><br>
@ -34,26 +21,13 @@ Eesti Interneti Sihtasutus
<br><br>
Hi,
<br><br>
Application for changing registrant of your domain <%= @domain.name %> has been filed. Please make sure that the update and information are correct. Incase of problems please turn to your registrar:
Application for changing registrant of your domain <%= @domain.name %> has been filed. Please make sure that the update and information are correct. In case of problems please turn to your registrar:
<p>
<%= @registrar.name %><br>
Email: <%= @registrar.email %><br>
Phone: <%= @registrar.phone %><br>
Website: <%= @registrar.url %>
</p>
<%= render 'registrar.en.html', registrar: @registrar %>
<br><br>
New registrant:<br>
Name: <%= @registrant.name %><br>
<% if @registrant.priv? %>
Personal code: <%= @registrant.ident %><br>
<% else %>
Business Registry code: <%= @registrant.ident %><br>
<% end %>
Street: <%= @registrant.street %><br>
City: <%= @registrant.city %><br>
Country: <%= @registrant.country %>
<%= render 'registrant.en.html', registrant: @registrant %>
<br><br>
The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.
<br><br>

View file

@ -2,21 +2,10 @@ Tere
Registrisse laekus taotlus domeeni <%= @domain.name %> registreerija vahetuseks. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduge oma registripidaja poole:
<%= @registrar.name %>
Email: <%= @registrar.email %>
Telefon: <%= @registrar.phone %>
Veebileht: <%= @registrar.url %>
<%= render 'registrar.et.text', registrar: @registrar %>
Uue registreerija andmed:
Nimi: <%= @registrant.name %>
<% if @registrant.priv? %>
Isikukood: <%= @registrant.ident %>
<% else %>
Äriregistrikood: <%= @registrant.ident %>
<% end %>
Tänav: <%= @registrant.street %>
Linn: <%= @registrant.city %>
Riik: <%= @registrant.country %>
<%= render 'registrant.et.text', registrant: @registrant %>
Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ei kinnita või tagasi lükka.
Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:
@ -31,21 +20,10 @@ Hi,
Application for changing registrant of your domain <%= @domain.name %> has been filed. Please make sure that the update and information are correct. In case of problems please turn to your registrar:
<%= @registrar.name %>
Email: <%= @registrar.email %>
Phone: <%= @registrar.phone %>
Website: <%= @registrar.url %>
<%= render 'registrar.en.text', registrar: @registrar %>
New registrant:
Name: <%= @registrant.name %>
<% if @registrant.priv? %>
Personal code: <%= @registrant.ident %>
<% else %>
Business Registry code: <%= @registrant.ident %>
<% end %>
Street: <%= @registrant.street %>
City: <%= @registrant.city %>
Country: <%= @registrant.country %>
<%= render 'registrant.en.text', registrant: @registrant %>
The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.
To confirm the update please visit this website, once again review the data and press approve:

View file

@ -0,0 +1,9 @@
Name: <%= registrant.name %><br>
<% if registrant.priv? %>
Personal code: <%= registrant.ident %><br>
<% else %>
Business Registry code: <%= registrant.ident %><br>
<% end %>
Street: <%= registrant.street %><br>
City: <%= registrant.city %><br>
Country: <%= registrant.country %>

View file

@ -0,0 +1,9 @@
Name: <%= registrant.name %>
<% if registrant.priv? %>
Personal code: <%= registrant.ident %>
<% else %>
Business Registry code: <%= registrant.ident %>
<% end %>
Street: <%= registrant.street %>
City: <%= registrant.city %>
Country: <%= registrant.country %>

View file

@ -0,0 +1,9 @@
Nimi: <%= registrant.name %><br>
<% if registrant.priv? %>
Isikukood: <%= registrant.ident %><br>
<% else %>
Äriregistrikood: <%= registrant.ident %><br>
<% end %>
Tänav: <%= registrant.street %><br>
Linn: <%= registrant.city %><br>
Riik: <%= registrant.country %>

View file

@ -0,0 +1,9 @@
Nimi: <%= registrant.name %>
<% if registrant.priv? %>
Isikukood: <%= registrant.ident %>
<% else %>
Äriregistrikood: <%= registrant.ident %>
<% end %>
Tänav: <%= registrant.street %>
Linn: <%= registrant.city %>
Riik: <%= registrant.country %>

View file

@ -0,0 +1,6 @@
<p>
<%= registrar.name %><br>
Email: <%= registrar.email %><br>
Phone: <%= registrar.phone %><br>
Website: <%= registrar.url %>
</p>

View file

@ -0,0 +1,4 @@
<%= registrar.name %>
Email: <%= registrar.email %>
Phone: <%= registrar.phone %>
Website: <%= registrar.url %>

View file

@ -0,0 +1,6 @@
<p>
<%= registrar.name %><br>
Email: <%= registrar.email %><br>
Telefon: <%= registrar.phone %><br>
Veebileht: <%= registrar.url %>
</p>

View file

@ -0,0 +1,4 @@
<%= registrar.name %>
Email: <%= registrar.email %>
Telefon: <%= registrar.phone %>
Veebileht: <%= registrar.url %>

View file

@ -0,0 +1,6 @@
<p>
<%= registrar.name %><br>
Электронная почта: <%= registrar.email %><br>
Телефон: <%= registrar.phone %><br>
Веб-сайт: <%= registrar.url %>
</p>

View file

@ -0,0 +1,4 @@
<%= registrar.name %>
Электронная почта: <%= registrar.email %>
Телефон: <%= registrar.phone %>
Веб-сайт: <%= registrar.url %>

View file

@ -2,33 +2,36 @@ require 'rails_helper'
RSpec.describe 'mailers/domain_mailer/expiration.html.erb' do
let(:domain) { instance_spy(DomainPresenter) }
let(:registrar) { instance_spy(RegistrarPresenter) }
let(:lang_count) { 3 }
before :example do
assign(:domain, domain)
assign(:registrar, registrar)
assign(:registrar, nil)
stub_template 'mailers/domain_mailer/registrar/_registrar.et.html' => 'test registrar estonian'
stub_template 'mailers/domain_mailer/registrar/_registrar.en.html' => 'test registrar english'
stub_template 'mailers/domain_mailer/registrar/_registrar.ru.html' => 'test registrar russian'
end
it 'has registrar name' do
mention_count = 2 * lang_count
expect(registrar).to receive(:name).exactly(mention_count).times.and_return('test registrar name')
it 'has registrar info in estonian' do
render
expect(rendered).to have_text('test registrar name', count: mention_count)
expect(rendered).to have_text('test registrar estonian')
end
registrar_attributes = %i(
email
phone
url
)
it 'has registrar info in english' do
render
expect(rendered).to have_text('test registrar english')
end
registrar_attributes.each do |attr_name|
it "has registrar #{attr_name}" do
expect(registrar).to receive(attr_name).exactly(lang_count).times.and_return("test registrar #{attr_name}")
render
expect(rendered).to have_text("test registrar #{attr_name}", count: lang_count)
end
it 'has registrar info in russian' do
render
expect(rendered).to have_text('test registrar russian')
end
it 'has domain name' do
mention_count = 4 * lang_count
expect(domain).to receive(:name).exactly(mention_count).times.and_return('test domain name')
render
expect(rendered).to have_text('test domain name', count: mention_count)
end
domain_attributes = %i(
@ -41,10 +44,10 @@ RSpec.describe 'mailers/domain_mailer/expiration.html.erb' do
)
domain_attributes.each do |attr_name|
it "has :#{attr_name}" do
expect(domain).to receive(attr_name).exactly(lang_count).times.and_return(attr_name.to_s)
it "has domain #{attr_name}" do
expect(domain).to receive(attr_name).exactly(lang_count).times.and_return("test domain #{attr_name}")
render
expect(rendered).to have_text(attr_name.to_s, count: lang_count)
expect(rendered).to have_text("test domain #{attr_name}", count: lang_count)
end
end
end

View file

@ -2,33 +2,36 @@ require 'rails_helper'
RSpec.describe 'mailers/domain_mailer/expiration.text.erb' do
let(:domain) { instance_spy(DomainPresenter) }
let(:registrar) { instance_spy(RegistrarPresenter) }
let(:lang_count) { 3 }
before :example do
assign(:domain, domain)
assign(:registrar, registrar)
assign(:registrar, nil)
stub_template 'mailers/domain_mailer/registrar/_registrar.et.text' => 'test registrar estonian'
stub_template 'mailers/domain_mailer/registrar/_registrar.en.text' => 'test registrar english'
stub_template 'mailers/domain_mailer/registrar/_registrar.ru.text' => 'test registrar russian'
end
it 'has registrar name' do
mention_count = 2 * lang_count
expect(registrar).to receive(:name).exactly(mention_count).times.and_return('test registrar name')
it 'has registrar info in estonian' do
render
expect(rendered).to have_text('test registrar name', count: mention_count)
expect(rendered).to have_text('test registrar estonian')
end
registrar_attributes = %i(
email
phone
url
)
it 'has registrar info in english' do
render
expect(rendered).to have_text('test registrar english')
end
registrar_attributes.each do |attr_name|
it "has registrar #{attr_name}" do
expect(registrar).to receive(attr_name).exactly(lang_count).times.and_return("test registrar #{attr_name}")
render
expect(rendered).to have_text("test registrar #{attr_name}", count: lang_count)
end
it 'has registrar info in russian' do
render
expect(rendered).to have_text('test registrar russian')
end
it 'has domain name' do
mention_count = 4 * lang_count
expect(domain).to receive(:name).exactly(mention_count).times.and_return('test domain name')
render
expect(rendered).to have_text('test domain name', count: mention_count)
end
domain_attributes = %i(
@ -41,10 +44,10 @@ RSpec.describe 'mailers/domain_mailer/expiration.text.erb' do
)
domain_attributes.each do |attr_name|
it "has :#{attr_name}" do
expect(domain).to receive(attr_name).exactly(lang_count).times.and_return(attr_name.to_s)
it "has domain #{attr_name}" do
expect(domain).to receive(attr_name).exactly(lang_count).times.and_return("test domain #{attr_name}")
render
expect(rendered).to have_text(attr_name.to_s, count: lang_count)
expect(rendered).to have_text("test domain #{attr_name}", count: lang_count)
end
end
end

View file

@ -2,13 +2,24 @@ require 'rails_helper'
RSpec.describe 'mailers/domain_mailer/pending_deleted.html.erb' do
let(:domain) { instance_spy(DomainPresenter) }
let(:registrar) { instance_spy(RegistrarPresenter) }
let(:lang_count) { 2 }
before :example do
assign(:domain, domain)
assign(:registrar, registrar)
assign(:verification_url, 'test url')
assign(:registrar, nil)
stub_template 'mailers/domain_mailer/registrar/_registrar.et.html' => 'test registrar estonian'
stub_template 'mailers/domain_mailer/registrar/_registrar.en.html' => 'test registrar english'
assign(:verification_url, 'test verification url')
end
it 'has registrar info in estonian' do
render
expect(rendered).to have_text('test registrar estonian')
end
it 'has registrar info in english' do
render
expect(rendered).to have_text('test registrar english')
end
it 'has domain name' do
@ -21,21 +32,6 @@ RSpec.describe 'mailers/domain_mailer/pending_deleted.html.erb' do
it 'has verification url' do
mention_count = 1 * lang_count
render
expect(rendered).to have_text('test url', count: mention_count)
end
registrar_attributes = %i(
name
email
phone
url
)
registrar_attributes.each do |attr_name|
it "has registrar #{attr_name}" do
expect(registrar).to receive(attr_name).exactly(lang_count).times.and_return("test registrar #{attr_name}")
render
expect(rendered).to have_text("test registrar #{attr_name}", count: lang_count)
end
expect(rendered).to have_text('test verification url', count: mention_count)
end
end

View file

@ -2,12 +2,24 @@ require 'rails_helper'
RSpec.describe 'mailers/domain_mailer/pending_deleted.text.erb' do
let(:domain) { instance_spy(DomainPresenter) }
let(:registrar) { instance_spy(RegistrarPresenter) }
let(:lang_count) { 2 }
before :example do
assign(:domain, domain)
assign(:registrar, registrar)
assign(:registrar, nil)
stub_template 'mailers/domain_mailer/registrar/_registrar.et.text' => 'test registrar estonian'
stub_template 'mailers/domain_mailer/registrar/_registrar.en.text' => 'test registrar english'
assign(:verification_url, 'test verification url')
end
it 'has registrar info in estonian' do
render
expect(rendered).to have_text('test registrar estonian')
end
it 'has registrar info in english' do
render
expect(rendered).to have_text('test registrar english')
end
it 'has domain name' do
@ -19,23 +31,7 @@ RSpec.describe 'mailers/domain_mailer/pending_deleted.text.erb' do
it 'has verification url' do
mention_count = 1 * lang_count
assign(:verification_url, 'test url')
render
expect(rendered).to have_text('test url', count: mention_count)
end
registrar_attributes = %i(
name
email
phone
url
)
registrar_attributes.each do |attr_name|
it "has registrar #{attr_name}" do
expect(registrar).to receive(attr_name).exactly(lang_count).times.and_return("test registrar #{attr_name}")
render
expect(rendered).to have_text("test registrar #{attr_name}", count: lang_count)
end
expect(rendered).to have_text('test verification url', count: mention_count)
end
end

View file

@ -0,0 +1,22 @@
require 'rails_helper'
RSpec.describe 'mailers/domain_mailer/pending_update_notification_for_new_registrant.html.erb' do
let(:domain) { instance_spy(DomainPresenter) }
let(:lang_count) { 2 }
before :example do
assign(:domain, domain)
end
domain_attributes = %i(
name
)
domain_attributes.each do |attr_name|
it "has domain #{attr_name}" do
expect(domain).to receive(attr_name).exactly(lang_count).times.and_return("test domain #{attr_name}")
render
expect(rendered).to have_text("test domain #{attr_name}", count: lang_count)
end
end
end

View file

@ -0,0 +1,22 @@
require 'rails_helper'
RSpec.describe 'mailers/domain_mailer/pending_update_notification_for_new_registrant.text.erb' do
let(:domain) { instance_spy(DomainPresenter) }
let(:lang_count) { 2 }
before :example do
assign(:domain, domain)
end
domain_attributes = %i(
name
)
domain_attributes.each do |attr_name|
it "has domain #{attr_name}" do
expect(domain).to receive(attr_name).exactly(lang_count).times.and_return("test domain #{attr_name}")
render
expect(rendered).to have_text("test domain #{attr_name}", count: lang_count)
end
end
end

View file

@ -2,36 +2,17 @@ require 'rails_helper'
RSpec.describe 'mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb' do
let(:domain) { instance_spy(DomainPresenter) }
let(:registrar) { instance_spy(RegistrarPresenter) }
let(:registrant) { instance_spy(RegistrantPresenter) }
let(:lang_count) { 2 }
before :example do
assign(:domain, domain)
assign(:registrar, registrar)
assign(:registrant, registrant)
assign(:verification_url, 'test url')
assign(:verification_url, 'test verification url')
end
it 'has verification url' do
mention_count = 1 * lang_count
render
expect(rendered).to have_text('test url', count: mention_count)
end
registrar_attributes = %i(
name
email
phone
url
)
registrar_attributes.each do |attr_name|
it "has registrar #{attr_name}" do
expect(registrar).to receive(attr_name).exactly(lang_count).times.and_return("test registrar #{attr_name}")
render
expect(rendered).to have_text("test registrar #{attr_name}", count: lang_count)
end
expect(rendered).to have_text('test verification url', count: mention_count)
end
domain_attributes = %i(
@ -45,20 +26,4 @@ RSpec.describe 'mailers/domain_mailer/pending_update_request_for_old_registrant.
expect(rendered).to have_text(attr_name.to_s, count: lang_count)
end
end
registrant_attributes = %i(
name
ident
street
city
country
)
registrant_attributes.each do |attr_name|
it "has registrant #{attr_name}" do
expect(registrant).to receive(attr_name).exactly(lang_count).times.and_return("test registrant #{attr_name}")
render
expect(rendered).to have_text("test registrant #{attr_name}", count: lang_count)
end
end
end

View file

@ -2,36 +2,17 @@ require 'rails_helper'
RSpec.describe 'mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb' do
let(:domain) { instance_spy(DomainPresenter) }
let(:registrar) { instance_spy(RegistrarPresenter) }
let(:registrant) { instance_spy(RegistrantPresenter) }
let(:lang_count) { 2 }
before :example do
assign(:domain, domain)
assign(:registrar, registrar)
assign(:registrant, registrant)
assign(:verification_url, 'test url')
assign(:verification_url, 'test verification url')
end
it 'has verification url' do
mention_count = 1 * lang_count
render
expect(rendered).to have_text('test url', count: mention_count)
end
registrar_attributes = %i(
name
email
phone
url
)
registrar_attributes.each do |attr_name|
it "has registrar #{attr_name}" do
expect(registrar).to receive(attr_name).exactly(lang_count).times.and_return("test registrar #{attr_name}")
render
expect(rendered).to have_text("test registrar #{attr_name}", count: lang_count)
end
expect(rendered).to have_text('test verification url', count: mention_count)
end
domain_attributes = %i(
@ -45,20 +26,4 @@ RSpec.describe 'mailers/domain_mailer/pending_update_request_for_old_registrant.
expect(rendered).to have_text(attr_name.to_s, count: lang_count)
end
end
registrant_attributes = %i(
name
ident
street
city
country
)
registrant_attributes.each do |attr_name|
it "has registrant #{attr_name}" do
expect(registrant).to receive(attr_name).exactly(lang_count).times.and_return("test registrant #{attr_name}")
render
expect(rendered).to have_text("test registrant #{attr_name}", count: lang_count)
end
end
end

View file

@ -0,0 +1,25 @@
require 'rails_helper'
RSpec.describe 'mailers/domain_mailer/_registrant.et.text.erb' do
let(:registrant) { instance_spy(RegistrantPresenter) }
before :example do
allow(view).to receive(:registrant).and_return(registrant)
end
attributes = %i(
name
ident
street
city
country
)
attributes.each do |attr_name|
it "has #{attr_name}" do
expect(registrant).to receive(attr_name).and_return("test #{attr_name}")
render
expect(rendered).to have_text("test #{attr_name}")
end
end
end

View file

@ -0,0 +1,24 @@
require 'rails_helper'
RSpec.describe 'mailers/domain_mailer/_registrar.et.text.erb' do
let(:registrar) { instance_spy(RegistrarPresenter) }
before :example do
allow(view).to receive(:registrar).and_return(registrar)
end
attributes = %i(
name
email
phone
url
)
attributes.each do |attr_name|
it "has #{attr_name}" do
expect(registrar).to receive(attr_name).and_return("test #{attr_name}")
render
expect(rendered).to have_text("test #{attr_name}")
end
end
end