From e7e34ae6f5f0a763cb3bfac6659d6bf2d758a6ed Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Sat, 20 Jul 2019 08:12:30 +0500 Subject: [PATCH] Display FederalSubject#number, #timezone --- app/views/federal_subjects/index.html.erb | 8 ++++++++ app/views/federal_subjects/show.html.erb | 9 +++++++++ config/locales/activerecord/en.yml | 2 ++ config/locales/activerecord/ru.yml | 2 ++ 4 files changed, 21 insertions(+) diff --git a/app/views/federal_subjects/index.html.erb b/app/views/federal_subjects/index.html.erb index e36e69d..64cd1de 100644 --- a/app/views/federal_subjects/index.html.erb +++ b/app/views/federal_subjects/index.html.erb @@ -2,9 +2,15 @@ + + @@ -12,7 +18,9 @@ <% @federal_subjects.each do |federal_subject| %> + +
+ <%= FederalSubject.human_attribute_name :number %> + <%= FederalSubject.human_attribute_name :display_name %> + <%= FederalSubject.human_attribute_name :timezone %> +
<%= federal_subject.number %> <%= federal_subject.display_name %><%= federal_subject.timezone %> <% if policy(federal_subject).show? %> <%= link_to federal_subject, diff --git a/app/views/federal_subjects/show.html.erb b/app/views/federal_subjects/show.html.erb index 127bca8..6315544 100644 --- a/app/views/federal_subjects/show.html.erb +++ b/app/views/federal_subjects/show.html.erb @@ -1,8 +1,17 @@

<%= @federal_subject.native_name %>

+

<%= @federal_subject.english_name %>

+ +
+
<%= FederalSubject.human_attribute_name :number %>
+
<%= @federal_subject.number %>
+ +
<%= FederalSubject.human_attribute_name :timezone %>
+
<%= @federal_subject.timezone %>
+
diff --git a/config/locales/activerecord/en.yml b/config/locales/activerecord/en.yml index 89db9cc..425c696 100644 --- a/config/locales/activerecord/en.yml +++ b/config/locales/activerecord/en.yml @@ -34,6 +34,8 @@ en: english_name: Name native_name: Name display_name: Name + number: Number + timezone: Time zone passport: id: ID first_name: First name diff --git a/config/locales/activerecord/ru.yml b/config/locales/activerecord/ru.yml index a809f39..c9f3965 100644 --- a/config/locales/activerecord/ru.yml +++ b/config/locales/activerecord/ru.yml @@ -34,6 +34,8 @@ ru: english_name: Название native_name: Название display_name: Название + number: Номер + timezone: Часовой пояс passport: id: ID first_name: Имя