From 344da76dc64904ea103bf99966e5fdaa0381cffd Mon Sep 17 00:00:00 2001
From: Alex Sherman <yul.golem@gmail.com>
Date: Thu, 5 Nov 2020 11:22:25 +0500
Subject: [PATCH] Fix email subject

---
 app/mailers/domain_expire_mailer.rb         | 6 +++---
 config/locales/mailers/domain_expire.en.yml | 7 ++++++-
 test/mailers/domain_expire_mailer_test.rb   | 8 +++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/mailers/domain_expire_mailer.rb b/app/mailers/domain_expire_mailer.rb
index e73b1fa84..229120825 100644
--- a/app/mailers/domain_expire_mailer.rb
+++ b/app/mailers/domain_expire_mailer.rb
@@ -17,7 +17,7 @@ class DomainExpireMailer < ApplicationMailer
     logger.info("Send DomainExpireMailer##{method_name} email for #{domain.name} (##{domain.id})" \
     " to #{recipient(domain).join(', ')}")
 
-    mail(to: recipient(domain), subject: subject)
+    mail(to: recipient(domain), subject: subject(method_name))
   end
 
   def init(domain, registrar)
@@ -29,8 +29,8 @@ class DomainExpireMailer < ApplicationMailer
     filter_invalid_emails(emails: domain.primary_contact_emails, domain: @domain)
   end
 
-  def subject
-    default_i18n_subject(domain_name: @domain.name)
+  def subject(method_name)
+    I18n.t("domain_expire_mailer.#{method_name}.subject", domain_name: @domain.name)
   end
 
   def domain_presenter(domain:)
diff --git a/config/locales/mailers/domain_expire.en.yml b/config/locales/mailers/domain_expire.en.yml
index 9a83a7a32..36353a44e 100644
--- a/config/locales/mailers/domain_expire.en.yml
+++ b/config/locales/mailers/domain_expire.en.yml
@@ -4,4 +4,9 @@ en:
       subject: >-
         Domeen %{domain_name} on aegunud
         / Domain %{domain_name} has expired
-        / Срок действия домена %{domain_name} истек
\ No newline at end of file
+        / Срок действия домена %{domain_name} истек
+    expired_soft:
+      subject: >-
+        Domeen %{domain_name} on aegunud ning suunatud kustutusmenetlusse
+        / Domain %{domain_name} has expired and directed into deletion process
+        / Срок действия домена %{domain_name} истек
diff --git a/test/mailers/domain_expire_mailer_test.rb b/test/mailers/domain_expire_mailer_test.rb
index 9209652fd..84e520b78 100644
--- a/test/mailers/domain_expire_mailer_test.rb
+++ b/test/mailers/domain_expire_mailer_test.rb
@@ -8,16 +8,18 @@ class DomainExpireMailerTest < ActionMailer::TestCase
     email = DomainExpireMailer.expired(domain: domain, registrar: domain.registrar).deliver_now
 
     assert_emails 1
-    assert_equal 'Domeen shop.test on aegunud / Domain shop.test has expired' \
-      ' / Срок действия домена shop.test истек', email.subject
+    assert_equal I18n.t("domain_expire_mailer.expired.subject", domain_name: domain.name),
+                 email.subject
   end
 
   def test_delivers_domain_expiration_soft_email
     domain = domains(:shop)
     assert_equal 'shop.test', domain.name
 
-    DomainExpireMailer.expired_soft(domain: domain, registrar: domain.registrar).deliver_now
+    email = DomainExpireMailer.expired_soft(domain: domain, registrar: domain.registrar).deliver_now
 
     assert_emails 1
+    assert_equal I18n.t("domain_expire_mailer.expired_soft.subject", domain_name: domain.name),
+                 email.subject
   end
 end