Fix translations

app/views/passports/_form.html.erb

@@ -10,7 +10,7 @@
                      as: :radio_buttons,
                      wrapper: :horizontal_collection_inline,
                      collection: PassportMap.sexes.keys.map { |sex|
-                       [Passport.human_attribute_name("sex.#{sex}"), sex]
+                       [PassportMap.human_attribute_name("sex.#{sex}"), sex]
                      } %>
 
         <%= ff.input :date_of_birth,

app/views/passports/index.html.erb

@@ -6,19 +6,19 @@
           <%= Passport.human_attribute_name :id %>
         </th>
         <th scope="col">
-          <%= Passport.human_attribute_name :surname %>
+          <%= PassportMap.human_attribute_name :surname %>
         </th>
         <th scope="col">
-          <%= Passport.human_attribute_name :given_name %>
+          <%= PassportMap.human_attribute_name :given_name %>
         </th>
         <th scope="col">
-          <%= Passport.human_attribute_name :patronymic %>
+          <%= PassportMap.human_attribute_name :patronymic %>
         </th>
         <th scope="col" class="d-none d-md-table-cell">
-          <%= Passport.human_attribute_name :date_of_birth %>
+          <%= PassportMap.human_attribute_name :date_of_birth %>
         </th>
         <th scope="col" class="d-none d-lg-table-cell">
-          <%= Passport.human_attribute_name :place_of_birth %>
+          <%= PassportMap.human_attribute_name :place_of_birth %>
         </th>
         <th scope="col"></th>
       </tr>

app/views/passports/show.html.erb

@@ -51,37 +51,37 @@
         </dd>
 
         <dt class="col-lg-4">
-          <%= Passport.human_attribute_name :surname %>
+          <%= PassportMap.human_attribute_name :surname %>
         </dt>
         <dd class="col-lg-8">
           <%= @passport.passport_map&.surname %>
         </dd>
 
         <dt class="col-lg-4">
-          <%= Passport.human_attribute_name :given_name %>
+          <%= PassportMap.human_attribute_name :given_name %>
         </dt>
         <dd class="col-lg-8">
           <%= @passport.passport_map&.given_name %>
         </dd>
 
         <dt class="col-lg-4">
-          <%= Passport.human_attribute_name :patronymic %>
+          <%= PassportMap.human_attribute_name :patronymic %>
         </dt>
         <dd class="col-lg-8">
           <%= @passport.passport_map&.patronymic %>
         </dd>
 
         <dt class="col-lg-4">
-          <%= Passport.human_attribute_name :sex %>
+          <%= PassportMap.human_attribute_name :sex %>
         </dt>
         <dd class="col-lg-8">
           <% if @passport.passport_map %>
-            <%= Passport.human_attribute_name "sex.#{@passport.passport_map.sex}" %>
+            <%= PassportMap.human_attribute_name "sex.#{@passport.passport_map.sex}" %>
           <% end %>
         </dd>
 
         <dt class="col-lg-4">
-          <%= Passport.human_attribute_name :date_of_birth %>
+          <%= PassportMap.human_attribute_name :date_of_birth %>
         </dt>
         <dd class="col-lg-8">
           <% if @passport.passport_map %>
@@ -90,14 +90,14 @@
         </dd>
 
         <dt class="col-lg-4">
-          <%= Passport.human_attribute_name :place_of_birth %>
+          <%= PassportMap.human_attribute_name :place_of_birth %>
         </dt>
         <dd class="col-lg-8">
           <%= @passport.passport_map&.place_of_birth %>
         </dd>
 
         <dt class="col-lg-4">
-          <%= Passport.human_attribute_name :series %>
+          <%= PassportMap.human_attribute_name :series %>
         </dt>
         <dd class="col-lg-8">
           <% if @passport.passport_map %>
@@ -106,7 +106,7 @@
         </dd>
 
         <dt class="col-lg-4">
-          <%= Passport.human_attribute_name :number %>
+          <%= PassportMap.human_attribute_name :number %>
         </dt>
         <dd class="col-lg-8">
           <% if @passport.passport_map %>
@@ -115,21 +115,21 @@
         </dd>
 
         <dt class="col-lg-4">
-          <%= Passport.human_attribute_name :issued_by %>
+          <%= PassportMap.human_attribute_name :issued_by %>
         </dt>
         <dd class="col-lg-8">
           <%= @passport.passport_map&.issued_by %>
         </dd>
 
         <dt class="col-lg-4">
-          <%= Passport.human_attribute_name :unit_code %>
+          <%= PassportMap.human_attribute_name :unit_code %>
         </dt>
         <dd class="col-lg-8">
           <%= @passport.passport_map&.unit_code %>
         </dd>
 
         <dt class="col-lg-4">
-          <%= Passport.human_attribute_name :date_of_issue %>
+          <%= PassportMap.human_attribute_name :date_of_issue %>
         </dt>
         <dd class="col-lg-8">
           <% if @passport.passport_map %>

config/locales/activerecord/en.yml

@@ -35,6 +35,9 @@ en:
         confirmed: Confirmed?
         passport_confirmations_count: Confirmations count
         images: Images
+      passport/confirmed:
+        'true': Confirmed
+        'false': Unconfirmed
       passport_map:
         id: ID
         surname: Surname
@@ -48,16 +51,13 @@ en:
         issued_by: Issued by
         unit_code: Unit code
         date_of_issue: Date of issue
+      passport_map/sex:
+        male: Male
+        female: Female
       country_state:
         id: ID
         membership_applications: Membership applications
         name: Name
-      passport/confirmed:
-        'true': Confirmed
-        'false': Unconfirmed
-      passport/sex:
-        male: Male
-        female: Female
       user:
         id: ID
         confirmation_sent_at: Confirmation sent at

config/locales/activerecord/ru.yml

@@ -35,6 +35,9 @@ ru:
         confirmed: Подтверждён?
         passport_confirmations_count: Количество подтверждений
         images: Изображения
+      passport/confirmed:
+        'true': Подтверждён
+        'false': Не подтверждён
       passport_map:
         id: ID
         surname: Фамилия
@@ -48,16 +51,13 @@ ru:
         issued_by: Кем выдан
         unit_code: Код подразделения
         date_of_issue: Дата выдачи
+      passport_map/sex:
+        male: Мужской
+        female: Женский
       country_state:
         id: ID
         membership_applications: Заявления на вступление
         name: Название
-      passport/confirmed:
-        'true': Подтверждён
-        'false': Не подтверждён
-      passport/sex:
-        male: Мужской
-        female: Женский
       user:
         id: ID
         confirmation_sent_at: Дата отправки подтверждения