Merge branch 'master' into registry-522

config/locales/admin/domain_versions.en.yml

@@ -3,3 +3,12 @@ en:
     domain_versions:
       archive:
         reset_btn: Reset
+        registrant_placeholder: Registrant
+        registrant: Registrant
+
+      show:
+        created: Created
+        updated: Updated
+        registrant: Registrant
+        admin_contacts: Admin. contacts
+        tech_contacts: Tech. contacts

config/locales/admin/domains.en.yml

@@ -3,6 +3,7 @@ en:
     domains:
       index:
         reset_btn: Reset
+        registrant: Registrant
 
       edit:
         add_new_status_btn: Add new status
@@ -22,7 +23,9 @@ en:
 
       versions:
         time: Time
-        admin_contact: Admin contact
+        registrant: Registrant
+        admin_contact: Admin. contact
+        tech_contact: Tech. contact
 
       partials:
         general:
@@ -30,6 +33,15 @@ en:
           delete_time: Delete time
           force_delete_time: Force delete time
 
+        admin_contacts:
+          title: Admin. contacts
+
+        tech_contacts:
+          title: Tech. contacts
+
+        owner:
+          title: Registrant
+
       force_delete_toggle_btn:
         schedule: Schedule force delete
         cancel: Cancel force delete

config/locales/contacts.en.yml

@@ -1,5 +1,10 @@
 en:
   activerecord:
+    models:
+      # Used in ContactMailer
+      registrant: Registrant
+      admin_domain_contact: Administrative contact
+      tech_domain_contact: Technical contact
     errors:
       models:
         contact:

config/locales/contacts.et.yml

@@ -0,0 +1,7 @@
+et:
+  activerecord:
+    models:
+      # Used in ContactMailer
+      registrant: Registreerija
+      admin_domain_contact: Halduskontakt
+      tech_domain_contact: Tehniline kontakt

config/locales/en.yml

@@ -285,8 +285,6 @@ en:
   valid_from: 'Valid from'
   general: 'General'
   contacts: 'Contacts'
-  tech_contacts: 'Technical contacts'
-  admin_contacts: 'Admin contacts'
   identity_code: 'Identity code'
   nameservers: 'Nameservers'
   hostname: 'Hostname'
@@ -319,7 +317,6 @@ en:
   failed_to_update_status: 'Failed to update status!'
   status_deleted: 'Status deleted!'
   failed_to_delete_status: 'Failed to delete status!'
-  tech_contact: 'Tech contact'
   new_domain_contact: 'New contact'
   domain_status_prohibits_deleting: 'Domain status prohibits deleting'
   domain_deleted: 'Domain deleted!'
@@ -553,11 +550,9 @@ en:
   info: 'Info'
   register: 'Register'
   send_epp_request: 'Send EPP Request'
-  registrant: 'Registrant'
   created_at: 'Created at'
   valid_to: 'Valid to'
   updated_at: 'Updated at'
-  tech_contacts: 'Tech contacts'
   name: 'Name'
   type: 'Type'
   code: 'Code'
@@ -760,8 +755,6 @@ en:
   unimplemented_object_service: 'Unimplemented object service'
   contact_email_update_subject: 'Teie domeenide kontakt epostiaadress on muutunud / Contact e-mail addresses of your domains have changed'
   object_status_prohibits_operation: 'Object status prohibits operation'
-  registrant_updated_notification_for_new_registrant_subject: 'Domeeni %{name} registreerija vahetus teostatud / Registrant change of %{name} has been finished.'
-  registrant_updated_notification_for_old_registrant_subject: 'Domeeni %{name} registreerija vahetus teostatud / Registrant change of %{name} has been finished.'
   pending_delete_rejected_notification_subject: "Domeeni %{name} kustutamise taotlus tagasi lükatud / %{name} deletion declined"
   pending_delete_expired_notification_subject: "Domeeni %{name} kustutamise taotlus on tühistatud / %{name} deletion cancelled"
   delete_confirmation_subject: "Domeeni %{name} kustutatud / %{name} deleted"

config/locales/et.yml

@@ -2,6 +2,3 @@ et:
   username: 'Kasutajanimi'
   password: 'Parool'
   log_in: 'Logi sisse'
-  registrant: registreerija
-  tech: tehniline kontakt
-  admin: halduskontakt

config/locales/mailers/registrant_change.en.yml

@@ -6,5 +6,9 @@ en:
       subject: Domeeni %{domain_name} registreerija vahetus protseduur on algatatud / %{domain_name} registrant change
     rejected:
       subject: Domeeni %{domain_name} registreerija vahetuse taotlus tagasi lükatud / %{domain_name} registrant change declined
+    confirmed:
+      subject: >-
+        Domeeni %{domain_name} registreerija vahetus teostatud
+        / Registrant change of %{domain_name} has been finished
     expired:
       subject: Domeeni %{domain_name} registreerija vahetuse taotlus on tühistatud / %{domain_name} registrant change cancelled

config/locales/registrant/domain_delete_confirms.en.yml

@@ -0,0 +1,5 @@
+en:
+  registrant:
+    domain_delete_confirms:
+      show:
+        registrant: Registrant

config/locales/registrant/domains.en.yml

@@ -0,0 +1,17 @@
+en:
+  registrant:
+    domains:
+      index:
+        registrant: Registrant
+
+      download_list:
+        registrant: Registrant
+      partials:
+        owner:
+          title: Registrant
+
+        admin_contacts:
+          title: Admin. contacts
+
+        tech_contacts:
+          title: Tech. contacts

config/locales/registrar/domains.en.yml

@@ -2,6 +2,7 @@ en:
   registrar:
     domains:
       index:
+        registrant: Registrant
         download_btn: Download
         csv:
           domain_name: Domain
@@ -15,8 +16,12 @@ en:
           flags: Flags
           alg: Algorithm
 
+        general:
+          registrant: Registrant
+
       partials:
         general:
+          registrant: Registrant
           registered: Registered
           created: Created
           updated: Updated