Skip to content

Commit b7d2b61

Browse files
tsubiktsubik
committed
refactor laws_page i18n keys
1 parent f42a7dd commit b7d2b61

File tree

5 files changed

+55
-82
lines changed

5 files changed

+55
-82
lines changed

‎app/admin/law.rb‎

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ def scoped_collection
2525
filter :subcategory,
2626
as: :select,
2727
collection: -> { Subcategory.joins(:laws).with_translations(I18n.locale).order("subcategory_translations.name") }
28-
filter :written_infraction_cont, label: proc { I18n.t("active_admin.laws_page.written_infraction") }
29-
filter :infraction_cont, label: proc { I18n.t("active_admin.laws_page.infraction") }
30-
filter :sanctions_cont, label: proc { I18n.t("active_admin.laws_page.sanctions") }
31-
filter :max_fine, label: proc { I18n.t("active_admin.laws_page.max_fine") }
32-
filter :min_fine, label: proc { I18n.t("active_admin.laws_page.min_fine") }
28+
filter :written_infraction_cont, label: proc { Law.human_attribute_name(:written_infraction) }
29+
filter :infraction_cont, label: proc { Law.human_attribute_name(:infraction) }
30+
filter :sanctions_cont, label: proc { Law.human_attribute_name(:sanctions) }
31+
filter :max_fine, label: proc { Law.human_attribute_name(:max_fine) }
32+
filter :min_fine, label: proc { Law.human_attribute_name(:min_fine) }
3333

3434
dependent_filters do
3535
{
@@ -46,15 +46,9 @@ def scoped_collection
4646
column :subcategory do |l|
4747
l.subcategory&.name
4848
end
49-
column I18n.t("active_admin.laws_page.written_infraction") do |l|
50-
l.written_infraction
51-
end
52-
column I18n.t("active_admin.laws_page.infraction") do |l|
53-
l.infraction
54-
end
55-
column I18n.t("active_admin.laws_page.sanctions") do |l|
56-
l.sanctions
57-
end
49+
column :written_infraction
50+
column :infraction
51+
column :sanctions
5852
column :min_fine
5953
column :max_fine
6054
column :currency
@@ -68,15 +62,15 @@ def scoped_collection
6862
index do
6963
column :country, sortable: "country_translations.name"
7064
column :subcategory, sortable: "subcategory_translations.name"
71-
column I18n.t("active_admin.laws_page.written_infraction"), :written_infraction, sortable: true
72-
column I18n.t("active_admin.laws_page.infraction"), :infraction, sortable: true
73-
column I18n.t("active_admin.laws_page.sanctions"), :sanctions, sortable: true
74-
column I18n.t("active_admin.laws_page.min_fine"), :min_fine, sortable: true
75-
column I18n.t("active_admin.laws_page.max_fine"), :max_fine, sortable: true
65+
column :written_infraction, sortable: true
66+
column :infraction, sortable: true
67+
column :sanctions, sortable: true
68+
column :min_fine, sortable: true
69+
column :max_fine, sortable: true
7670
column :currency
7771
column :penal_servitude, sortable: true
7872
column :other_penalties, sortable: true
79-
column I18n.t("active_admin.laws_page.indicator_apv"), :apv, sortable: true
73+
column :apv, sortable: true
8074
column :created_at, sortable: true
8175
column :updated_at, sortable: true
8276

@@ -85,7 +79,7 @@ def scoped_collection
8579

8680
form do |f|
8781
f.semantic_errors(*f.object.errors.attribute_names)
88-
f.inputs I18n.t("active_admin.laws_page.law_details") do
82+
f.inputs I18n.t("active_admin.shared.law_details") do
8983
if f.object.new_record?
9084
f.input :country
9185
f.input :subcategory, as: :select,
@@ -95,15 +89,15 @@ def scoped_collection
9589
f.input :subcategory, input_html: {disabled: true}
9690
end
9791

98-
f.input :written_infraction, label: I18n.t("active_admin.laws_page.written_infraction")
99-
f.input :infraction, label: I18n.t("active_admin.laws_page.infraction")
100-
f.input :sanctions, label: I18n.t("active_admin.laws_page.sanctions")
101-
f.input :min_fine, label: I18n.t("active_admin.laws_page.min_fine")
102-
f.input :max_fine, label: I18n.t("active_admin.laws_page.max_fine")
92+
f.input :written_infraction
93+
f.input :infraction
94+
f.input :sanctions
95+
f.input :min_fine
96+
f.input :max_fine
10397
f.input :currency
10498
f.input :penal_servitude
10599
f.input :other_penalties
106-
f.input :apv, label: I18n.t("active_admin.laws_page.indicator_apv")
100+
f.input :apv
107101

108102
f.actions
109103
end

‎app/admin/observation.rb‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def self.observations
219219
column Law.human_attribute_name(:other_penalties) do |observation|
220220
observation.law&.other_penalties
221221
end
222-
column I18n.t("active_admin.laws_page.indicator_apv") do |observation|
222+
column Law.human_attribute_name(:apv) do |observation|
223223
observation.law&.apv
224224
end
225225
column I18n.t("activerecord.models.severity") do |observation|
@@ -294,15 +294,15 @@ def self.observations
294294
end
295295
column :subcategory, sortable: false
296296

297-
column(I18n.t("active_admin.laws_page.written_infraction"), class: "col-written_infraction", sortable: false) { |o| o.law&.written_infraction }
298-
column(I18n.t("active_admin.laws_page.infraction"), class: "col-infration", sortable: false) { |o| o.law&.infraction }
299-
column(I18n.t("active_admin.laws_page.sanctions"), class: "col-sanctions", sortable: false) { |o| o.law&.sanctions }
300-
column(I18n.t("active_admin.laws_page.min_fine"), class: "col-minimum_fine", sortable: false) { |o| o.law&.min_fine }
301-
column(I18n.t("active_admin.laws_page.max_fine"), class: "col-maximum_fine", sortable: false) { |o| o.law&.max_fine }
297+
column(Law.human_attribute_name(:written_infraction), class: "col-written_infraction", sortable: false) { |o| o.law&.written_infraction }
298+
column(Law.human_attribute_name(:infraction), class: "col-infration", sortable: false) { |o| o.law&.infraction }
299+
column(Law.human_attribute_name(:sanctions), class: "col-sanctions", sortable: false) { |o| o.law&.sanctions }
300+
column(Law.human_attribute_name(:min_fine), class: "col-minimum_fine", sortable: false) { |o| o.law&.min_fine }
301+
column(Law.human_attribute_name(:max_fine), class: "col-maximum_fine", sortable: false) { |o| o.law&.max_fine }
302302
column(Law.human_attribute_name(:currency), class: "col-currency") { |o| o.law&.currency }
303303
column(Law.human_attribute_name(:penal_servitude), class: "col-penal_servitude", sortable: false) { |o| o.law&.penal_servitude }
304304
column(Law.human_attribute_name(:other_penalties), class: "col-other_penalties", sortable: false) { |o| o.law&.other_penalties }
305-
column(I18n.t("active_admin.laws_page.indicator_apv"), class: "col-indicator_apv", sortable: false) { |o| o.law&.apv }
305+
column(Law.human_attribute_name(:apv), class: "col-indicator_apv", sortable: false) { |o| o.law&.apv }
306306

307307
column I18n.t("activerecord.models.severity"), class: "col-severity", sortable: false do |o|
308308
o&.severity&.level
@@ -370,15 +370,15 @@ def self.observations
370370
["governments", Observation.human_attribute_name(:governments), :checked],
371371
["relevant_operators", Observation.human_attribute_name(:relevant_operators), :checked],
372372
["subcategory", Observation.human_attribute_name(:subcategory), :checked],
373-
["written_infraction", I18n.t("active_admin.laws_page.written_infraction"), :checked],
374-
["infraction", I18n.t("active_admin.laws_page.infraction"), :checked],
375-
["sanctions", I18n.t("active_admin.laws_page.sanctions"), :checked],
376-
["minimum_fine", I18n.t("active_admin.laws_page.min_fine"), :checked],
377-
["maximum_fine", I18n.t("active_admin.laws_page.max_fine"), :checked],
373+
["written_infraction", Law.human_attribute_name(:written_infraction), :checked],
374+
["infraction", Law.human_attribute_name(:infraction), :checked],
375+
["sanctions", Law.human_attribute_name(:sanctions), :checked],
376+
["minimum_fine", Law.human_attribute_name(:min_fine), :checked],
377+
["maximum_fine", Law.human_attribute_name(:max_fine), :checked],
378378
["currency", Law.human_attribute_name(:currency), :checked],
379379
["penal_servitude", Law.human_attribute_name(:penal_servitude), :checked],
380380
["other_penalties", Law.human_attribute_name(:other_penalties), :checked],
381-
["indicator_apv", I18n.t("active_admin.laws_page.indicator_apv"), :checked],
381+
["indicator_apv", Law.human_attribute_name(:apv), :checked],
382382
["severity", I18n.t("activerecord.models.severity"), :checked],
383383
["publication_date", Observation.human_attribute_name(:publication_date), :checked],
384384
["actions_taken", Observation.human_attribute_name(:actions_taken), :checked],

‎config/locales/en.yml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ en:
175175
actions: 'Actions'
176176
active: 'Active'
177177
inactive: 'Inactive'
178+
law_details: 'Law details'
178179
report_details: 'Report Details'
179180
category_details: 'Category Details'
180181
subcategory_details: 'Subcategory Details'
@@ -335,14 +336,6 @@ en:
335336
evidence_page:
336337
evidence_removed: 'Evidence removed!'
337338
evidence_must_be_recycled: 'Evidence must be moved to recycle bin first!'
338-
laws_page:
339-
written_infraction: 'Illegality as written by law'
340-
infraction: 'Legal reference: Illegality'
341-
sanctions: 'Legal reference: Penalties'
342-
max_fine: 'Maximum Fine'
343-
min_fine: 'Minimum Fine'
344-
indicator_apv: 'Indicator APV'
345-
law_details: 'Law details'
346339
fmus_page:
347340
certification: Certification
348341
download_shapefile: 'Download shapefile'
@@ -752,18 +745,18 @@ en:
752745
operators: Operators #g
753746

754747
law:
755-
apv: Apv #g
748+
apv: 'Indicator APV'
749+
written_infraction: 'Illegality as written by law'
750+
infraction: 'Legal reference: Illegality'
751+
sanctions: 'Legal reference: Penalties'
752+
max_fine: 'Maximum Fine'
753+
min_fine: 'Minimum Fine'
756754
country: :activerecord.models.country #g
757755
currency: Currency #g
758-
infraction: Infraction #g
759-
max_fine: Max fine #g
760-
min_fine: Min fine #g
761756
observations: Observations #g
762757
other_penalties: Other penalties #g
763758
penal_servitude: Penal servitude #g
764-
sanctions: Sanctions #g
765759
subcategory: :activerecord.models.subcategory #g
766-
written_infraction: Written infraction #g
767760

768761
notification:
769762
dismissed_at: Dismissed at #g

‎config/locales/es.yml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ es:
174174
actions: 'Acciones'
175175
active: 'Activo'
176176
inactive: 'Inactivo'
177+
law_details: 'Detalles de la ley'
177178
report_details: 'Detalles del informe'
178179
category_details: 'Detalles de la categoría'
179180
subcategory_details: 'Detalles de la subcategoría'
@@ -334,14 +335,6 @@ es:
334335
evidence_page:
335336
evidence_removed: '¡Evidencia eliminada!'
336337
evidence_must_be_recycled: '¡La evidencia debe moverse primero a la papelera de reciclaje!'
337-
laws_page:
338-
written_infraction: 'Ilegalidad según la ley'
339-
infraction: 'Referencia legal: Ilegalidad'
340-
sanctions: 'Referencia legal: Sanciones'
341-
max_fine: 'Multa máxima'
342-
min_fine: 'Multa mínima'
343-
indicator_apv: 'Indicador APV'
344-
law_details: 'Detalles de la ley'
345338
fmus_page:
346339
certification: Certificación
347340
download_shapefile: 'Descargar shapefile'
@@ -751,18 +744,18 @@ es:
751744
operators: Operadores
752745

753746
law:
754-
apv: APV
747+
written_infraction: 'Ilegalidad según la ley'
748+
infraction: 'Referencia legal: Ilegalidad'
749+
sanctions: 'Referencia legal: Sanciones'
750+
max_fine: 'Multa máxima'
751+
min_fine: 'Multa mínima'
752+
apv: 'Indicador APV'
755753
country: :activerecord.models.country
756754
currency: Moneda
757-
infraction: Infracción
758-
max_fine: Multa máxima
759-
min_fine: Multa mínima
760755
observations: Observaciones
761756
other_penalties: Otras sanciones
762757
penal_servitude: Servidumbre penal
763-
sanctions: Sanciones
764758
subcategory: :activerecord.models.subcategory
765-
written_infraction: Infracción escrita
766759

767760
notification:
768761
dismissed_at: Descartado el

‎config/locales/fr.yml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ fr:
184184
actions: 'Actions'
185185
active: 'Actif'
186186
inactive: 'Inactif'
187+
law_details: 'Détails de la loi'
187188
report_details: 'Détails du rapport'
188189
category_details: 'Détails de la catégorie'
189190
subcategory_details: 'Détails de la sous-catégorie'
@@ -366,14 +367,6 @@ fr:
366367
remove_logo: 'Supprimer le logo'
367368
documents: 'Documents'
368369
marked_as_relevant: 'Marqué comme exploitant concerné'
369-
laws_page:
370-
written_infraction: "L'illégalité telle qu'écrite par la loi"
371-
infraction: 'Référence légale : Illégalité'
372-
sanctions: 'Référence légale : Sanctions'
373-
max_fine: 'Amende maximale'
374-
min_fine: 'Amende minimale'
375-
indicator_apv: 'Indicateur APV'
376-
law_details: 'Détails de la loi'
377370
fmus_page:
378371
certification: Certification
379372
download_shapefile: 'Télécharger shapefile'
@@ -688,18 +681,18 @@ fr:
688681
operators: Les opérateurs #g
689682

690683
law:
691-
apv: Apv #g
684+
written_infraction: "L'illégalité telle qu'écrite par la loi"
685+
infraction: 'Référence légale : Illégalité'
686+
sanctions: 'Référence légale : Sanctions'
687+
max_fine: 'Amende maximale'
688+
min_fine: 'Amende minimale'
689+
apv: 'Indicateur APV'
692690
country: :activerecord.models.country #g
693691
currency: Devise #g
694-
infraction: Infraction #g
695-
max_fine: Amende maximale #g
696-
min_fine: Amende minimale #g
697692
observations: Observations #g
698693
other_penalties: Autres pénalités #g
699694
penal_servitude: Servitude pénale #g
700-
sanctions: Les sanctions #g
701695
subcategory: :activerecord.models.subcategory #g
702-
written_infraction: Infraction écrite #g
703696

704697
notification:
705698
dismissed_at: Licencié à #g

0 commit comments

Comments
 (0)