From 30a7fd5f26b7c5f4db79b06460f8b9eb6e9843f5 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 1 Aug 2017 19:20:46 +0300
Subject: [PATCH] Refactor contact translation

#569
---
 config/locales/contacts.en.yml | 24 ++++++++++++++++++++++++
 config/locales/en.yml          | 27 ---------------------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/config/locales/contacts.en.yml b/config/locales/contacts.en.yml
index 2061d2abd..c3e183721 100644
--- a/config/locales/contacts.en.yml
+++ b/config/locales/contacts.en.yml
@@ -9,5 +9,29 @@ en:
       models:
         contact:
           attributes:
+            code:
+              blank: "Required parameter missing - code"
+              too_long_contact_code: "Contact code is too long, max 100 characters"
+            name:
+              blank: "Required parameter missing - name"
+            phone:
+              blank: "Required parameter missing - phone"
+              invalid: "Phone nr is invalid"
+            email:
+              blank: "Required parameter missing - email"
+              invalid: "Email is invalid"
+            ident:
+              blank: "Required parameter missing - ident"
+              invalid_EE_identity_format: "Ident not in valid Estonian identity format."
+              invalid_EE_identity_format_update: "Ident not in valid Estonian identity format. Please create new contact"
+              invalid_birthday_format: "Ident not in valid birthday format, should be YYYY-MM-DD"
+              invalid_country_code: "Ident country code is not valid, should be in ISO_3166-1 alpha 2 format"
+            ident_type:
+              ident_type_invalid: 'Ident type is invalid'
+              epp_ident_type_invalid: 'Object status prohibits operation: ident_type of contact %{code} is invalid'
+            domains:
+              exist: 'Object association prohibits operation'
+            statuses:
+              not_uniq: 'not uniq'
             country_code:
               invalid: Country code is not valid, should be in ISO_3166-1 alpha 2 format
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8501ae2bd..2a20e6871 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -34,33 +34,6 @@ en:
   activerecord:
     errors:
       models:
-        contact:
-          attributes:
-            code:
-              blank: "Required parameter missing - code"
-              too_long_contact_code: "Contact code is too long, max 100 characters"
-            name:
-              blank: "Required parameter missing - name"
-            phone:
-              blank: "Required parameter missing - phone"
-              invalid: "Phone nr is invalid"
-            email:
-              blank: "Required parameter missing - email"
-              invalid: "Email is invalid"
-            ident:
-              blank: "Required parameter missing - ident"
-              invalid_EE_identity_format: "Ident not in valid Estonian identity format."
-              invalid_EE_identity_format_update: "Ident not in valid Estonian identity format. Please create new contact"
-              invalid_birthday_format: "Ident not in valid birthday format, should be YYYY-MM-DD"
-              invalid_country_code: "Ident country code is not valid, should be in ISO_3166-1 alpha 2 format"
-            ident_type:
-              ident_type_invalid: 'Ident type is invalid'
-              epp_ident_type_invalid: 'Object status prohibits operation: ident_type of contact %{code} is invalid'
-            domains:
-              exist: 'Object association prohibits operation'
-            statuses:
-              not_uniq: 'not uniq'
-
         epp_domain: &epp_domain_ar_attributes
           attributes:
             base: