From 42b01512afa2e847d3ae2d2c9806b5fe2ce6615a Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Sun, 17 Jun 2018 19:28:01 +0300
Subject: [PATCH] Improve translations

---
 .../contacts/show/_address.html.erb           | 20 +++++++---------
 .../contacts/show/_domains.html.erb           | 12 ++++++----
 .../contacts/show/_general.html.erb           | 24 ++++++++-----------
 .../contacts/show/_statuses.html.erb          |  6 ++---
 config/locales/registrant/contacts.en.yml     | 17 +++++++++++++
 5 files changed, 46 insertions(+), 33 deletions(-)
 create mode 100644 config/locales/registrant/contacts.en.yml

diff --git a/app/views/registrant/contacts/show/_address.html.erb b/app/views/registrant/contacts/show/_address.html.erb
index 5804f89e9..c9bc80150 100644
--- a/app/views/registrant/contacts/show/_address.html.erb
+++ b/app/views/registrant/contacts/show/_address.html.erb
@@ -1,34 +1,30 @@
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">
-            <%= t(:address) %>
+            <%= t '.header' %>
         </h3>
     </div>
 
     <div class="panel-body">
         <dl class="dl-horizontal">
             <% if @contact.org_name.present? %>
-                <dt>
-                    <%= t(:org_name) %>
-                </dt>
-                <dd>
-                    <%= @contact.org_name %>
-                </dd>
+                <dt><%= Contact.human_attribute_name :org_name %></dt>
+                <dd><%= @contact.org_name %></dd>
             <% end %>
 
-            <dt><%= t(:street) %></dt>
+            <dt><%= Contact.human_attribute_name :street %></dt>
             <dd><%= @contact.street %></dd>
 
-            <dt><%= t(:city) %></dt>
+            <dt><%= Contact.human_attribute_name :city %></dt>
             <dd><%= @contact.city %></dd>
 
-            <dt><%= t(:zip) %></dt>
+            <dt><%= Contact.human_attribute_name :zip %></dt>
             <dd><%= @contact.zip %></dd>
 
-            <dt><%= t(:state) %></dt>
+            <dt><%= Contact.human_attribute_name :state %></dt>
             <dd><%= @contact.state %></dd>
 
-            <dt><%= t(:country) %></dt>
+            <dt><%= Contact.human_attribute_name :country %></dt>
             <dd><%= @contact.country %></dd>
         </dl>
     </div>
diff --git a/app/views/registrant/contacts/show/_domains.html.erb b/app/views/registrant/contacts/show/_domains.html.erb
index ce1cc271d..dbdb7d0fd 100644
--- a/app/views/registrant/contacts/show/_domains.html.erb
+++ b/app/views/registrant/contacts/show/_domains.html.erb
@@ -4,7 +4,7 @@
 <div class="panel panel-default" id="contacts">
     <div class="panel-heading">
         <div class="pull-left">
-            <%= t(:domains) %>
+            <%= t '.header'%>
         </div>
 
         <div class="pull-right">
@@ -26,11 +26,15 @@
         <table class="table table-hover table-bordered table-condensed">
             <thead>
                 <tr>
-                    <th class="col-xs-3"><%= custom_sort_link t(:domain_name), :name %></th>
                     <th class="col-xs-3">
-                        <%= custom_sort_link t(:registrar_name), :registrar_name %>
+                        <%= custom_sort_link Domain.human_attribute_name(:name), :name %>
+                    </th>
+                    <th class="col-xs-3">
+                        <%= custom_sort_link Registrar.model_name.human, :registrar_name %>
+                    </th>
+                    <th class="col-xs-3">
+                        <%= custom_sort_link Domain.human_attribute_name(:valid_to), :valid_to %>
                     </th>
-                    <th class="col-xs-3"><%= custom_sort_link t(:valid_to), :valid_to %></th>
                     <th class="col-xs-3">
                         <%= custom_sort_link Domain.human_attribute_name(:roles), :roles %>
                     </th>
diff --git a/app/views/registrant/contacts/show/_general.html.erb b/app/views/registrant/contacts/show/_general.html.erb
index db57f1b65..109d6316a 100644
--- a/app/views/registrant/contacts/show/_general.html.erb
+++ b/app/views/registrant/contacts/show/_general.html.erb
@@ -1,39 +1,35 @@
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">
-            <%= t(:general) %>
+            <%= t '.header' %>
         </h3>
     </div>
 
     <div class="panel-body">
         <dl class="dl-horizontal">
-            <dt><%= t(:id) %></dt>
+            <dt><%= Contact.human_attribute_name :code %></dt>
             <dd><%= @contact.code %></dd>
 
-            <dt><%= t(:name) %></dt>
+            <dt><%= Contact.human_attribute_name :name %></dt>
             <dd><%= @contact.name %></dd>
 
-            <dt><%= t(:password) %></dt>
+            <dt><%= Contact.human_attribute_name :auth_info %></dt>
             <dd><%= text_field_tag :auth_info, @contact.auth_info, readonly: true,
                                    class: 'partially-hidden' %></dd>
             <br/>
 
-            <dt><%= t(:ident) %></dt>
+            <dt><%= Contact.human_attribute_name :ident %></dt>
             <dd><%= ident_for(@contact) %></dd>
 
-            <dt><%= t(:email) %></dt>
+            <dt><%= Contact.human_attribute_name :email %></dt>
             <dd><%= @contact.email %></dd>
 
-            <dt><%= t(:phone) %></dt>
+            <dt><%= Contact.human_attribute_name :phone %></dt>
             <dd><%= @contact.phone %></dd>
 
             <% if @contact.fax %>
-                <dt>
-                    <%= t(:fax) %>
-                </dt>
-                <dd>
-                    <%= @contact.fax %>
-                </dd>
+                <dt><%= Contact.human_attribute_name :fax %></dt>
+                <dd><%= @contact.fax %></dd>
             <% end %>
 
             <br/>
@@ -52,7 +48,7 @@
                 <%= @contact.name %>
             </dd>
 
-            <dt><%= t(:registrar_name) %></dt>
+            <dt><%= Registrar.model_name.human %></dt>
             <dd>
                 <% if @contact.registrar.present? %>
                     <%= link_to @contact.registrar, registrant_registrar_path(@contact.registrar) %>
diff --git a/app/views/registrant/contacts/show/_statuses.html.erb b/app/views/registrant/contacts/show/_statuses.html.erb
index e3bbab10d..90fb7cc73 100644
--- a/app/views/registrant/contacts/show/_statuses.html.erb
+++ b/app/views/registrant/contacts/show/_statuses.html.erb
@@ -1,15 +1,15 @@
 <% panel_class = contact.errors.messages[:statuses] ? 'panel-danger' : 'panel-default' %>
 <div class="<%= panel_class %> panel" id="contact_statuses">
     <div class="panel-heading clearfix">
-        <%= t(:statuses) %>
+        <%= t '.header' %>
     </div>
 
     <div class="table-responsive">
         <table class="table table-hover table-bordered table-condensed">
             <thead>
                 <tr>
-                    <th class="col-xs-6"><%= t(:status) %></th>
-                    <th class="col-xs-6"><%= t(:notes) %></th>
+                    <th class="col-xs-6"><%= t '.status' %></th>
+                    <th class="col-xs-6"><%= t '.notes' %></th>
                 </tr>
             </thead>
 
diff --git a/config/locales/registrant/contacts.en.yml b/config/locales/registrant/contacts.en.yml
new file mode 100644
index 000000000..0cb49130c
--- /dev/null
+++ b/config/locales/registrant/contacts.en.yml
@@ -0,0 +1,17 @@
+en:
+  registrant:
+    contacts:
+      show:
+        general:
+          header: General
+
+        address:
+          header: Address
+
+        statuses:
+          header: Statuses
+          status: Status
+          notes: Note
+
+        domains:
+          header: Domains
\ No newline at end of file