Merge pull request #607 from af83/6955-translations-fixesHEADmaster

Refs #6955 Add some new translations

8 files changed, 13 insertions, 14 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/route_decorator.rb b/app/decorators/route_decorator.rb
index 801e139b0..ef4674649 100644
--- a/app/decorators/route_decorator.rb
+++ b/app/decorators/route_decorator.rb
@@ -90,7 +90,7 @@ class RouteDecorator < AF83::Decorator
     end
 
     instance_decorator.destroy_action_link do |l|
-      l.data confirm: t('routes.actions.destroy_confirm')
+      l.data {{ confirm: h.t('routes.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 28fcde5ab..d69b29a2b 100644
--- a/app/views/line_footnotes/_footnote_fields.html.slim
+++ b/app/views/line_footnotes/_footnote_fields.html.slim
@@ -1,10 +1,10 @@
 .nested-fields.col-lg-4.col-md-4.col-sm-6.col-xs-12
   .panel.panel-default
     .panel-body
-      = f.input :code, label: 'Titre'
-      = f.input :label, label: 'Texte'
+     = f.input :code, label: Chouette::Footnote.tmf(:code)
+      = f.input :label, label: Chouette::Footnote.tmf(:label)
       
       .text-right
-        = link_to_remove_association f, class: 'btn btn-outline-danger', data: { confirm: 'Etes-vous sûr(e) ?' }, 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')