diff options
| -rw-r--r-- | app/decorators/compliance_control_decorator.rb | 2 | ||||
| -rw-r--r-- | app/decorators/compliance_control_set_decorator.rb | 4 | ||||
| -rw-r--r-- | app/decorators/purchase_window_decorator.rb | 2 | ||||
| -rw-r--r-- | app/decorators/referential_network_decorator.rb | 3 | ||||
| -rw-r--r-- | app/decorators/routing_constraint_zone_decorator.rb | 2 | ||||
| -rw-r--r-- | app/decorators/stop_area_decorator.rb | 6 | ||||
| -rw-r--r-- | app/views/line_footnotes/_footnote_fields.html.slim | 2 | ||||
| -rw-r--r-- | config/locales/compliance_control_sets.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/footnotes.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/footnotes.fr.yml | 1 |
10 files changed, 13 insertions, 12 deletions
diff --git a/app/decorators/compliance_control_decorator.rb b/app/decorators/compliance_control_decorator.rb index 7cdb4a890..70cfa9ea0 100644 --- a/app/decorators/compliance_control_decorator.rb +++ b/app/decorators/compliance_control_decorator.rb @@ -17,7 +17,7 @@ class ComplianceControlDecorator < AF83::Decorator instance_decorator.edit_action_link instance_decorator.destroy_action_link do |l| - l.data confirm: t('compliance_controls.actions.destroy_confirm') + l.data {{ confirm: h.t('compliance_controls.actions.destroy_confirm') }} end end diff --git a/app/decorators/compliance_control_set_decorator.rb b/app/decorators/compliance_control_set_decorator.rb index ad38c492c..38f3e212e 100644 --- a/app/decorators/compliance_control_set_decorator.rb +++ b/app/decorators/compliance_control_set_decorator.rb @@ -18,9 +18,9 @@ class ComplianceControlSetDecorator < AF83::Decorator end instance_decorator.destroy_action_link do |l| - l.content h.destroy_link_content + l.content { h.destroy_link_content } l.href { h.compliance_control_set_path(object.id) } - l.data confirm: t('compliance_control_sets.actions.destroy_confirm') + l.data {{ confirm: h.t('compliance_control_sets.actions.destroy_confirm') }} end end end diff --git a/app/decorators/purchase_window_decorator.rb b/app/decorators/purchase_window_decorator.rb index 8e6ca9d36..c73aaf3dd 100644 --- a/app/decorators/purchase_window_decorator.rb +++ b/app/decorators/purchase_window_decorator.rb @@ -15,7 +15,7 @@ class PurchaseWindowDecorator < AF83::Decorator instance_decorator.edit_action_link instance_decorator.destroy_action_link do |l| - l.data confirm: t('purchase_windows.actions.destroy_confirm') + l.data {{ confirm: h.t('purchase_windows.actions.destroy_confirm') }} end end diff --git a/app/decorators/referential_network_decorator.rb b/app/decorators/referential_network_decorator.rb index f8c656e7c..637f51531 100644 --- a/app/decorators/referential_network_decorator.rb +++ b/app/decorators/referential_network_decorator.rb @@ -20,8 +20,7 @@ class ReferentialNetworkDecorator < AF83::Decorator end instance_decorator.destroy_action_link do |l| - l.content { h.destroy_link_content('networks.actions.destroy') } - l.data confirm: t('networks.actions.destroy_confirm') + l.data {{ confirm: h.t('networks.actions.destroy_confirm') }} end end end diff --git a/app/decorators/routing_constraint_zone_decorator.rb b/app/decorators/routing_constraint_zone_decorator.rb index 3ff286cc1..201964dc3 100644 --- a/app/decorators/routing_constraint_zone_decorator.rb +++ b/app/decorators/routing_constraint_zone_decorator.rb @@ -21,7 +21,7 @@ class RoutingConstraintZoneDecorator < AF83::Decorator instance_decorator.edit_action_link instance_decorator.destroy_action_link do |l| - l.data confirm: t('routing_constraint_zones.actions.destroy_confirm') + l.data {{ confirm: h.t('routing_constraint_zones.actions.destroy_confirm') }} end end end diff --git a/app/decorators/stop_area_decorator.rb b/app/decorators/stop_area_decorator.rb index c7f10b13b..b25f2d261 100644 --- a/app/decorators/stop_area_decorator.rb +++ b/app/decorators/stop_area_decorator.rb @@ -23,7 +23,7 @@ class StopAreaDecorator < AF83::Decorator ) end l.method :put - l.data confirm: t('stop_areas.actions.deactivate_confirm') + l.data {{ confirm: h.t('stop_areas.actions.deactivate_confirm') }} l.add_class 'delete-action' end @@ -36,13 +36,13 @@ class StopAreaDecorator < AF83::Decorator ) end l.method :put - l.data confirm: t('stop_areas.actions.activate_confirm') + l.data {{ confirm: h.t('stop_areas.actions.activate_confirm') }} l.add_class 'delete-action' end instance_decorator.destroy_action_link do |l| l.content { h.destroy_link_content('stop_areas.actions.destroy') } - l.data confirm: t('stop_areas.actions.destroy_confirm') + l.data {{ confirm: h.t('stop_areas.actions.destroy_confirm') }} end end diff --git a/app/views/line_footnotes/_footnote_fields.html.slim b/app/views/line_footnotes/_footnote_fields.html.slim index acb772b00..d69b29a2b 100644 --- a/app/views/line_footnotes/_footnote_fields.html.slim +++ b/app/views/line_footnotes/_footnote_fields.html.slim @@ -5,6 +5,6 @@ = f.input :label, label: Chouette::Footnote.tmf(:label) .text-right - = link_to_remove_association f, class: 'btn btn-outline-danger', data: { confirm: t('are_you_sure') }, title: t('actions.delete') do + = link_to_remove_association f, class: 'btn btn-outline-danger', data: { confirm: t('footnotes.actions.destroy_confirm') }, title: t('actions.delete') do span.fa.fa-trash / span = t('actions.delete') diff --git a/config/locales/compliance_control_sets.en.yml b/config/locales/compliance_control_sets.en.yml index c69689390..6fc735bfb 100644 --- a/config/locales/compliance_control_sets.en.yml +++ b/config/locales/compliance_control_sets.en.yml @@ -23,7 +23,7 @@ en: destroy: Destroy add_compliance_control: Compliance Control add_compliance_control_block: Compliance Control Block - destroy_confirm: Are you sure ? + destroy_confirm: Are you sure you want to destroy this compliance control set ? loaded: Load the control filters: name: 'Enter name ...' diff --git a/config/locales/footnotes.en.yml b/config/locales/footnotes.en.yml index c0e29bdc2..09ffb86b1 100644 --- a/config/locales/footnotes.en.yml +++ b/config/locales/footnotes.en.yml @@ -5,6 +5,7 @@ en: footnotes: actions: add_footnote: "add footnote" + destroy_confirm: Are you sure you want to delete this footnote ? index: title: "Footnotes" activerecord: diff --git a/config/locales/footnotes.fr.yml b/config/locales/footnotes.fr.yml index 2cf81d5b6..fa7325570 100644 --- a/config/locales/footnotes.fr.yml +++ b/config/locales/footnotes.fr.yml @@ -5,6 +5,7 @@ fr: footnotes: actions: add_footnote: "Ajouter une note" + destroy_confirm: Etes vous sûr de supprimer cette note ? index: title: "Notes" activerecord: |