From 055e42df093cf3a35645ff221d97e6fdbcef2cc3 Mon Sep 17 00:00:00 2001
From: Georg Kahest <georg@tld.ee>
Date: Mon, 25 Sep 2017 17:49:06 +0300
Subject: [PATCH] improve expire email readability

---
 .../mailers/domain_expire_mailer/expired.html.erb  | 14 ++++++++++----
 .../mailers/domain_expire_mailer/expired.text.erb  | 11 +++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/views/mailers/domain_expire_mailer/expired.html.erb b/app/views/mailers/domain_expire_mailer/expired.html.erb
index d9a96b50a..c6a83a2d4 100644
--- a/app/views/mailers/domain_expire_mailer/expired.html.erb
+++ b/app/views/mailers/domain_expire_mailer/expired.html.erb
@@ -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:
@@ -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 %>
@@ -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>
 
diff --git a/app/views/mailers/domain_expire_mailer/expired.text.erb b/app/views/mailers/domain_expire_mailer/expired.text.erb
index ab0ba5a14..c64735d2b 100644
--- a/app/views/mailers/domain_expire_mailer/expired.text.erb
+++ b/app/views/mailers/domain_expire_mailer/expired.text.erb
@@ -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 %>
 
@@ -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:
 
@@ -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".
 
 Для продления регистрации домена просим обратиться к своему регистратору: