From 7b2306c0aa760c1f48389ffb9484aa5bf8997f97 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Fri, 19 Jul 2019 00:11:33 +0500
Subject: [PATCH] Display FederalSubject#display_name

---
 app/views/federal_subjects/index.html.erb | 8 ++------
 config/locales/activerecord/en.yml        | 1 +
 config/locales/activerecord/ru.yml        | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/federal_subjects/index.html.erb b/app/views/federal_subjects/index.html.erb
index 656ce1a..e36e69d 100644
--- a/app/views/federal_subjects/index.html.erb
+++ b/app/views/federal_subjects/index.html.erb
@@ -3,10 +3,7 @@
     <thead>
       <tr>
         <th scope="col">
-          <%= FederalSubject.human_attribute_name :english_name %>
-        </th>
-        <th scope="col">
-          <%= FederalSubject.human_attribute_name :native_name %>
+          <%= FederalSubject.human_attribute_name :display_name %>
         </th>
         <th scope="col"></th>
       </tr>
@@ -15,8 +12,7 @@
     <tbody>
       <% @federal_subjects.each do |federal_subject| %>
         <tr>
-          <td><%= federal_subject.english_name %></td>
-          <td><%= federal_subject.native_name %></td>
+          <td><%= federal_subject.display_name %></td>
           <td>
             <% if policy(federal_subject).show? %>
               <%= link_to federal_subject,
diff --git a/config/locales/activerecord/en.yml b/config/locales/activerecord/en.yml
index 760e239..3bdcb93 100644
--- a/config/locales/activerecord/en.yml
+++ b/config/locales/activerecord/en.yml
@@ -36,6 +36,7 @@ en:
         id: ID
         english_name: Name
         native_name: Name
+        display_name: Name
       passport:
         id: ID
         first_name: First name
diff --git a/config/locales/activerecord/ru.yml b/config/locales/activerecord/ru.yml
index bee6b32..b20d0b5 100644
--- a/config/locales/activerecord/ru.yml
+++ b/config/locales/activerecord/ru.yml
@@ -36,6 +36,7 @@ ru:
         id: ID
         english_name: Название
         native_name: Название
+        display_name: Название
       passport:
         id: ID
         first_name: Имя