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.

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

change registration value in mailers #1164

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 10 additions & 14 deletions app/views/result_mailer/registration_code_email.html.erb
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<!DOCTYPE html>
<html>
<head>
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
</head>
<body>
<p><%= t('.salutation', display_name: @user.display_name) %></p>
<p>
<%= t('.introduction_html', domain_name: @auction.domain_name,
link: link_to(t('.link_title'), result_url(@result.uuid))) %>
</p>
<p><%= t('.details', domain_name: @auction.domain_name, days: 14) %></p>
<p><%= t('.reminder', domain_name: @auction.domain_name) %></body>

<%= t('common_mailer.footer_html') %>
</body>
<head>
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
</head>
<body>
<p><%= t('.salutation', display_name: @user.display_name) %></p>
<p><%= t('.introduction_html', domain_name: @auction.domain_name, link: link_to(t('.link_title'), result_url(@result.uuid))) %></p>
<p><%= t('.details', domain_name: @auction.domain_name, days: Setting.find_by(code: 'registration_term').retrieve) %></p>
<p><%= t('.reminder', domain_name: @auction.domain_name) %></body>
<%= t('common_mailer.footer_html') %>
</body>
</html>
31 changes: 14 additions & 17 deletions app/views/result_mailer/winner_email.html.erb
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
<!DOCTYPE html>
<html>
<head>
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
</head>
<body>
<p><%= t('.salutation', display_name: @user.display_name) %></p>
<p><%= t('.introduction', domain_name: @auction.domain_name) %></p>
<p>
<%= t('.details_html',
domain_name: @auction.domain_name,
link: link_to(t('.auction_link'), result_url(@result.uuid))) %>
</p>
<p><%= t('.linkpay_html', linkpay_url: @linkpay_url) if @linkpay_url %></p>
<p><%= t('.details_second_para_html', domain_name: @auction.domain_name) %></p>
<p><%= t('.details_third_para', domain_name: @auction.domain_name) %></p>

<%= t('common_mailer.footer_html') %>
</body>
<head>
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
</head>
<body>
<p><%= t('.salutation', display_name: @user.display_name) %></p>
<p><%= t('.introduction', domain_name: @auction.domain_name) %></p>
<p>
<%= t('.details_html', domain_name: @auction.domain_name, link: link_to(t('.auction_link'), result_url(@result.uuid))) %>
</p>
<p><%= t('.linkpay_html', linkpay_url: @linkpay_url) if @linkpay_url %></p>
<p><%= t('.details_second_para_html', domain_name: @auction.domain_name, registration_limit: Setting.find_by(code: 'registration_term').retrieve) %></p>
<p><%= t('.details_third_para', domain_name: @auction.domain_name) %></p>
<%= t('common_mailer.footer_html') %>
</body>
</html>
2 changes: 1 addition & 1 deletion config/locales/mailers/result_mailer.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ en:
You can pay for this invoice using following <a href=%{linkpay_url}>link</a>.
auction_link: ".ee auction portal"
details_second_para_html: |
You will find the registration code in your user account once you have paid the invoice on time. The code will allow you to register the %{domain_name} domain namewithin 14 days. To register the %{domain_name} domain, contact an a href="https://www.internet.ee/registrars/accredited-registrars">accredited .ee registrar</a> as soon as possible! If you leave it to the last minute, your service provider may not be able to register the domain.
You will find the registration code in your user account once you have paid the invoice on time. The code will allow you to register the %{domain_name} domain name within %{registration_limit} days. To register the %{domain_name} domain, contact an a href="https://www.internet.ee/registrars/accredited-registrars">accredited .ee registrar</a> as soon as possible! If you leave it to the last minute, your service provider may not be able to register the domain.
details_third_para: |
The prepayment invoice must be paid within 7 days. If you fail to pay, you will
lose the right to the auctioned priority and priority for the %{domain_name} domain
Expand Down
2 changes: 1 addition & 1 deletion config/locales/mailers/result_mailer.et.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ et:
auction_link: ".ee oksjonikeskkonnas"
details_second_para_html: |
Arve õigeaegsel tasumisel leiate oma kasutajakonto alt vastava reserveerimiskoodi,
millega saate 14. päeva jooksul enampakkumisel võidetud %{domain_name}
millega saate %{registration_limit}. päeva jooksul enampakkumisel võidetud %{domain_name}
domeeninime registreerida. Domeeni %{domain_name} registreerimiseks pöörduge
<a href="https://www.internet.ee/registripidajad/akrediteeritud-registripidajad">
.ee akrediteeritud registripidaja</a> poole esimesel võimalusel! Viimasele hetkele
Expand Down