From 03f2ab0463f8e2685d077d25a425ee2c8d3f3986 Mon Sep 17 00:00:00 2001
From: tsoganov <sergei.tsoganov@ut.ee>
Date: Tue, 14 Jan 2025 15:31:53 +0200
Subject: [PATCH] Improved verification email translations

---
 app/mailers/registrar_mailer.rb                             | 2 +-
 .../contact_mailer/identification_requested.html.erb        | 4 ++--
 .../contact_mailer/identification_requested.text.erb        | 4 ++--
 config/locales/mailers/contact.en.yml                       | 6 +++++-
 config/locales/mailers/registrar.en.yml                     | 6 ++++++
 5 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 config/locales/mailers/registrar.en.yml

diff --git a/app/mailers/registrar_mailer.rb b/app/mailers/registrar_mailer.rb
index aafc1e8ff..99a364527 100644
--- a/app/mailers/registrar_mailer.rb
+++ b/app/mailers/registrar_mailer.rb
@@ -3,7 +3,7 @@ class RegistrarMailer < ApplicationMailer
 
   def contact_verified(email:, contact:, poi:)
     @contact = contact
-    subject = 'Successful Contact Verification'
+    subject = default_i18n_subject(contact_code: contact.code)
     attachments['proof_of_identity.pdf'] = poi
     mail(to: email, subject: subject)
   end
diff --git a/app/views/mailers/contact_mailer/identification_requested.html.erb b/app/views/mailers/contact_mailer/identification_requested.html.erb
index b1b03c5e0..bb1d3f8a7 100644
--- a/app/views/mailers/contact_mailer/identification_requested.html.erb
+++ b/app/views/mailers/contact_mailer/identification_requested.html.erb
@@ -8,7 +8,7 @@ Teie registripidaja <%= registrar.name %> on palunud Teil kinnitada oma isikut,
 <br><br>
 Palun kinnitage oma isikut, et jätkata.
 <br><br>
-<a href="<%= @verification_link %>" style="display: inline-block; padding: 10px 20px; background-color: #007BFF; color: white; text-decoration: none; border-radius: 5px;">Jätka eeID-ga</a>
+<a href="<%= @verification_link + "?ui_locale=et" %>" style="display: inline-block; padding: 10px 20px; background-color: #007BFF; color: white; text-decoration: none; border-radius: 5px;">Jätka eeID-ga</a>
 <br><br>
 Kontaktandmed:<br>
 <%= render 'mailers/shared/registrant/registrant.et.html', registrant: contact, with_phone: true %>
@@ -24,7 +24,7 @@ Your registrar <%= registrar.name %> has requested that you verify your identity
 <br><br>
 Please confirm your identity to continue.
 <br><br>
-<a href="<%= @verification_link %>" style="display: inline-block; padding: 10px 20px; background-color: #007BFF; color: white; text-decoration: none; border-radius: 5px;">Continue with eeID</a>
+<a href="<%= @verification_link + "?ui_locale=en" %>" style="display: inline-block; padding: 10px 20px; background-color: #007BFF; color: white; text-decoration: none; border-radius: 5px;">Continue with eeID</a>
 <br><br>
 Contact information:<br>
 <%= render 'mailers/shared/registrant/registrant.en.html', registrant: contact, with_phone: true %>
diff --git a/app/views/mailers/contact_mailer/identification_requested.text.erb b/app/views/mailers/contact_mailer/identification_requested.text.erb
index a1a8e1d5f..e9b2e82e5 100644
--- a/app/views/mailers/contact_mailer/identification_requested.text.erb
+++ b/app/views/mailers/contact_mailer/identification_requested.text.erb
@@ -6,7 +6,7 @@ Tere <%= contact.name %>,
 
 Teie registripidaja <%= registrar.name %> on palunud teil kinnitada oma isikut, et jätkata domeeni toimingutega. 
 Palun kinnitage oma isikut, klõpsates alloleval lingil:
-<%= @verification_link %>
+<%= @verification_link + "?ui_locales=et" %>
 
 Kontaktandmed:
 <%= render 'mailers/shared/registrant/registrant.et.text', registrant: contact, with_phone: true %>
@@ -21,7 +21,7 @@ Hi <%= contact.name %>,
 
 Your registrar <%= registrar.name %> has requested that you verify your identity in order to proceed with domain actions. 
 Please confirm your identity to continue by clicking the link below:
-<%= @verification_link %>
+<%= @verification_link + "?ui_locales=en" %>
 
 Contact information:
 <%= render 'mailers/shared/registrant/registrant.en.text', registrant: contact, with_phone: true %>
diff --git a/config/locales/mailers/contact.en.yml b/config/locales/mailers/contact.en.yml
index c9d653f22..fa34f6867 100644
--- a/config/locales/mailers/contact.en.yml
+++ b/config/locales/mailers/contact.en.yml
@@ -3,4 +3,8 @@ en:
     email_changed:
       subject: >-
         Teie domeenide kontakt epostiaadress on muutunud
-        / Contact e-mail addresses of your domains have changed [%{contact_code}]
\ No newline at end of file
+        / Contact e-mail addresses of your domains have changed [%{contact_code}]
+    identification_requested:
+      subject: >-
+        Palun kinnitage oma isik domeeni toimingute jätkamiseks
+        / Please verify your identity to proceed with domain operations
\ No newline at end of file
diff --git a/config/locales/mailers/registrar.en.yml b/config/locales/mailers/registrar.en.yml
new file mode 100644
index 000000000..a230113ca
--- /dev/null
+++ b/config/locales/mailers/registrar.en.yml
@@ -0,0 +1,6 @@
+en:
+  registrar_mailer:
+    contact_verified:
+      subject: >-
+        Teade: Kontakti [%{contact_code}] kinnitamine edukalt lõpule viidud
+        / Notification: Contact [%{contact_code}] verification successfully completed
\ No newline at end of file