Merge branch 'feature/spanish'

Author: tsubik

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: https://github.com/tsubik/active_admin_paranoia.git
-  revision: 3f3fd26962ae4d8aee139a3b8f7256e2d1d340dc
+  revision: cf5de101901e49eebf3ab76aae9e290d5e44f546
   specs:
     active_admin_paranoia (1.0.11)
       paranoia (>= 1.0)

app/admin/country.rb

@@ -20,7 +20,7 @@ def scoped_collection
 
   filter :iso, as: :select
   filter :translations_name_cont, as: :select,
-    label: -> { I18n.t("activerecord.attributes.country.name") },
+    label: -> { Country.human_attribute_name(:name) },
     collection: -> { Country.order(:name).pluck(:name) }
   filter :region_iso, as: :select
   filter :region_name

app/admin/government.rb

@@ -41,7 +41,7 @@ def scoped_collection
 
   filter :country, as: :select, collection: -> { Country.joins(:governments).by_name_asc }
   filter :translations_government_entity_cont,
-    as: :select, label: -> { I18n.t("activerecord.attributes.government/translation.government_entity") },
+    as: :select, label: -> { I18n.t("activerecord.attributes.government.government_entity") },
     collection: -> { Government.by_entity_asc.distinct.pluck(:government_entity) }
 
   dependent_filters do

app/admin/observation.rb

@@ -311,7 +311,7 @@ def self.observations
     column :actions_taken, sortable: false do |o|
       o.actions_taken[0..100] + ((o.actions_taken.length >= 100) ? "..." : "") if o.actions_taken
     end
-    column I18n.t("activerecord.attributes.observation/translation.details"), class: "col-details", &:details
+    column :details, class: "col-details"
     column :evidence_type
     column I18n.t("active_admin.menu.independent_monitoring.evidence"), class: "col-evidence" do |o|
       links = []
@@ -322,7 +322,7 @@ def self.observations
       links.reduce(:+)
     end
     column :evidence_on_report, sortable: false
-    column I18n.t("activerecord.attributes.observation/translation.concern_opinion"), class: "col-concern_opinion" do |o|
+    column :concern_opinion, class: "col-concern_opinion" do |o|
       o.concern_opinion[0..100] + ((o.concern_opinion.length >= 100) ? "..." : "") if o.concern_opinion
     end
     column :pv, sortable: false
@@ -382,17 +382,17 @@ def self.observations
             ["severity", I18n.t("activerecord.models.severity"), :checked],
             ["publication_date", I18n.t("activerecord.attributes.observation.publication_date"), :checked],
             ["actions_taken", I18n.t("activerecord.attributes.observation.actions_taken"), :checked],
-            ["details", I18n.t("activerecord.attributes.observation/translation.details"), :checked],
+            ["details", Observation.human_attribute_name(:details), :checked],
             ["evidence_type", I18n.t("activerecord.attributes.observation.evidence_type"), :checked],
             ["evidence", I18n.t("active_admin.menu.independent_monitoring.evidence"), :checked],
             ["evidence_on_report", I18n.t("activerecord.attributes.observation.evidence_on_report"), :checked],
-            ["concern_opinion", I18n.t("activerecord.attributes.observation/translation.concern_opinion"), :checked],
+            ["concern_opinion", I18n.t("activerecord.attributes.observation.concern_opinion"), :checked],
             ["pv", I18n.t("activerecord.attributes.observation.pv"), :checked],
             ["location_accuracy", I18n.t("activerecord.attributes.observation.location_accuracy"), :checked],
             ["lat", I18n.t("activerecord.attributes.observation.lat"), :checked],
             ["lng", I18n.t("activerecord.attributes.observation.lng"), :checked],
             ["is_physical_place", I18n.t("activerecord.attributes.observation.is_physical_place"), :checked],
-            ["litigation_status", I18n.t("activerecord.attributes.observation/translation.litigation_status"), :checked],
+            ["litigation_status", I18n.t("activerecord.attributes.observation.litigation_status"), :checked],
             ["report", I18n.t("document_types.Report"), :checked],
             ["monitor_comment", I18n.t("activerecord.attributes.observation.monitor_comment"), :checked],
             ["user", I18n.t("activerecord.attributes.observation.user"), :checked],

app/admin/operator.rb

@@ -125,7 +125,7 @@
     as: :select,
     collection: -> { Country.joins(:operators).with_translations(I18n.locale).order("country_translations.name") }
   filter :id,
-    as: :select, label: -> { I18n.t("activerecord.attributes.operator.name") },
+    as: :select, label: -> { Operator.human_attribute_name(:name) },
     collection: -> { Operator.order(:name).pluck(:name, :id) }
   filter :fa_id_present, as: :boolean, label: proc { I18n.t("active_admin.operator_page.with_fa_uuid") }
   filter :fmus_id_null, as: :boolean, label: proc { I18n.t("active_admin.operator_page.fmus_id_null") }

app/admin/partner.rb

@@ -13,7 +13,7 @@ def scoped_collection
 
   permit_params :website, :logo, :priority, :category, translations_attributes: [:id, :locale, :name, :description]
 
-  filter :translations_name_cont, as: :select, label: proc { I18n.t("activerecord.attributes.partner.name") },
+  filter :translations_name_cont, as: :select, label: proc { Partner.human_attribute_name(:name) },
     collection: -> { Partner.with_translations(I18n.locale).pluck(:name) }
   filter :website, as: :select
 

app/admin/required_gov_document.rb

@@ -21,7 +21,7 @@
   filter :document_type, as: :select, collection: RequiredGovDocument.document_types
   filter :translations_name_eq,
     as: :select,
-    label: -> { I18n.t("activerecord.attributes.required_gov_document.name") },
+    label: -> { RequiredGovDocument.human_attribute_name(:name) },
     collection: -> {
       RequiredGovDocument.with_translations(I18n.locale).order("required_gov_document_translations.name").pluck(:name)
     }

app/admin/required_gov_document_group.rb

@@ -35,7 +35,7 @@
 
   filter :translations_name_cont,
     as: :select,
-    label: -> { I18n.t("activerecord.attributes.required_gov_document_group/translation.name") },
+    label: -> { RequiredGovDocumentGroup.human_attribute_name(:name) },
     collection: -> {
       RequiredGovDocumentGroup.with_translations(I18n.locale)
         .order("required_gov_document_group_translations.name").pluck(:name)

app/admin/required_operator_document_group.rb

@@ -29,7 +29,7 @@
   end
 
   filter :translations_name_cont,
-    label: proc { I18n.t("activerecord.attributes.required_operator_document_group.name") },
+    label: proc { RequiredGovDocumentGroup.human_attribute_name(:name) },
     as: :select,
     collection: -> {
       RequiredOperatorDocumentGroup.with_translations(I18n.locale)

app/admin/severity.rb

@@ -17,7 +17,7 @@ def scoped_collection
 
   permit_params :subcategory_id, :level, translations_attributes: [:id, :locale, :details, :_destroy]
 
-  filter :translations_details_cont, label: -> { I18n.t("activerecord.attributes.severity.details") }
+  filter :translations_details_cont, label: -> { Severity.human_attribute_name(:details) }
   filter :subcategory, as: :select,
     collection: -> { Subcategory.with_translations(I18n.locale).order("subcategory_translations.name") }
   filter :level, as: :select, collection: 0..3