Merge pull request #2737 from internetee/improve-verification-translations

Improved verification email translations

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

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_locales=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_locales=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 %>

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 %>

config/locales/mailers/contact.en.yml

@@ -4,3 +4,7 @@ en:
       subject: >-
         Teie domeenide kontakt epostiaadress on muutunud
         / 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

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

test/integration/eeid/identification_requests_webhook_test.rb

@@ -32,7 +32,10 @@ class Eeid::IdentificationRequestsWebhookTest < ActionDispatch::IntegrationTest
     assert_equal({ 'status' => 'success' }, JSON.parse(response.body))
     assert_not_nil @contact.reload.verified_at
     assert_equal @contact.verification_id, '123'
-    assert_notify_registrar('Successful Contact Verification')
+    assert_notify_registrar(
+      "Teade: Kontakti [#{@contact.code}] kinnitamine edukalt lõpule viidud " \
+        "/ Notification: Contact [#{@contact.code}] verification successfully completed"
+    )
   end
 
   test 'should return unauthorized for invalid HMAC signature' do

test/integration/repp/v1/contacts/verify_test.rb

@@ -23,7 +23,7 @@ class ReppV1ContactsVerifyTest < ActionDispatch::IntegrationTest
           claims_required: [{ type: 'sub', value: "#{@contact.ident_country_code}#{@contact.ident}" }],
           reference: @contact.code
         }
-      ).to_return(status: 200, body: { id: '123' }.to_json, headers: { 'Content-Type' => 'application/json' })
+      ).to_return(status: 200, body: { id: '123', link: 'http://link' }.to_json, headers: { 'Content-Type' => 'application/json' })
   end
 
   def test_returns_error_when_not_found
@@ -47,7 +47,10 @@ class ReppV1ContactsVerifyTest < ActionDispatch::IntegrationTest
     assert contact.present?
     assert contact.ident_request_sent_at
     assert_nil contact.verified_at
-    assert_notify_contact('Identification requested')
+    assert_notify_contact(
+      'Palun kinnitage oma isik domeeni toimingute jätkamiseks ' \
+        '/ Please verify your identity to proceed with domain operations'
+    )
   end
 
   def test_handles_non_epp_error