Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve expire email readability #598

Merged
merged 1 commit into from
Sep 27, 2017
Merged

improve expire email readability #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions app/views/mailers/domain_expire_mailer/expired.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
Domeen <%= @domain.name %> on aegunud<br>
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.
Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav.
<br>
Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
<br><br>
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja:
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja poole:
<%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
<br><br>
Domeeni <%= @domain.name %> kohta on registris järgmised andmed:
Expand All @@ -24,7 +26,9 @@ Eesti Interneti Sihtasutus
The <%= @domain.name %> domain has expired<br>
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.
The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>.
<br>
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:
<%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
Expand All @@ -48,7 +52,9 @@ Estonian Internet Foundation
Уважаемый пользователь домена .ee<br>
<br>

Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете. С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете.
<br>
С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".

<br><br>

Expand Down
11 changes: 7 additions & 4 deletions app/views/mailers/domain_expire_mailer/expired.text.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Domeen <%= @domain.name %> on aegunud
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.
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:
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja poole:

<%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %>

Expand All @@ -24,7 +25,8 @@ Eesti Interneti Sihtasutus
The <%= @domain.name %> domain has expired
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.
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:

Expand All @@ -47,7 +49,8 @@ Estonian Internet Foundation
Домен <%= @domain.name %> устарел
Уважаемый пользователь домена .ee

Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете. С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете.
С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".

Для продления регистрации домена просим обратиться к своему регистратору:

Expand Down