Skip to content

Commit 447f69a

Browse files
committed
Merge branch 'feature/new-fmu-certificate' into staging
2 parents b940771 + 6a2f029 commit 447f69a

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

app/admin/fmu.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ def download_shapefiles(fmus)
7070
}
7171
end
7272

73-
sidebar "Shapefiles", only: :index do
73+
sidebar :shapefiles, only: :index do
7474
div do
75-
link_to "Download Filtered Shapefiles", download_filtered_shapefiles_admin_fmus_path(
75+
link_to I18n.t("active_admin.fmus_page.download_filtered_shapefiles"), download_filtered_shapefiles_admin_fmus_path(
7676
q: params[:q]&.to_unsafe_h
7777
), class: "button text-center mt-10px"
7878
end
@@ -102,7 +102,7 @@ def download_shapefiles(fmus)
102102
column :certification_ls
103103
end
104104

105-
sidebar I18n.t("active_admin.fmus_page.certification"), class: "fmu_certificates_sidebar", only: :show do
105+
sidebar :certification, class: "fmu_certificates_sidebar", only: :show do
106106
attributes_table do
107107
row :certification_fsc
108108
row :certification_pefc

config/locales/en.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ en:
6969
sidebars:
7070
filters: "Filters"
7171
search_status: "Search Status"
72+
certification: "Certification"
73+
shapefiles: "Shapefiles"
7274
pagination:
7375
empty: "No %{model} found"
7476
one: "Displaying <b>1</b> %{model}"
@@ -323,6 +325,7 @@ en:
323325
fmus_page:
324326
certification: Certification
325327
download_shapefile: 'Download shapefile'
328+
download_filtered_shapefiles: 'Download Filtered Shapefiles'
326329
confirm_delete: 'Are you sure you want to delete this FMU?'
327330
operator_page:
328331
producer: 'Producer'

config/locales/es.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ es:
6868
sidebars:
6969
filters: "Filtros"
7070
search_status: "Estado de búsqueda"
71+
certification: "Certificación"
7172
pagination:
7273
empty: "No se encontraron %{model}"
7374
one: "Mostrando <b>1</b> %{model}"
@@ -338,6 +339,7 @@ es:
338339
fmus_page:
339340
certification: Certificación
340341
download_shapefile: 'Descargar shapefile'
342+
download_filtered_shapefiles: 'Descargar Shapefiles Filtrados'
341343
confirm_delete: '¿Estás seguro de que quieres eliminar este FMU?'
342344
operator_page:
343345
producer: 'Productor'

config/locales/fr.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ fr:
8080
sidebars:
8181
filters: "Filtres"
8282
search_status: "Statut de la recherche"
83+
certification: "Certification"
8384
pagination:
8485
empty: "Aucun %{model} trouvé"
8586
one: "Affichage de <b>1</b> %{model}"
@@ -354,6 +355,7 @@ fr:
354355
fmus_page:
355356
certification: Certification
356357
download_shapefile: 'Télécharger shapefile'
358+
download_filtered_shapefiles: 'Télécharger les shapefiles filtrés'
357359
confirm_delete: 'Êtes-vous sûr de vouloir supprimer cette FMU?'
358360
required_operator_document_page:
359361
exists: 'Existe'

0 commit comments

Comments
 (0)