diff options
| -rw-r--r-- | app/decorators/compliance_control_decorator.rb | 4 | ||||
| -rw-r--r-- | app/decorators/compliance_control_set_decorator.rb | 2 | ||||
| -rw-r--r-- | app/decorators/line_decorator.rb | 6 | ||||
| -rw-r--r-- | app/decorators/network_decorator.rb | 4 | ||||
| -rw-r--r-- | app/decorators/purchase_window_decorator.rb | 2 | ||||
| -rw-r--r-- | app/decorators/referential_line_decorator.rb | 4 | ||||
| -rw-r--r-- | app/decorators/referential_network_decorator.rb | 4 | ||||
| -rw-r--r-- | app/decorators/route_decorator.rb | 12 | ||||
| -rw-r--r-- | app/decorators/routing_constraint_zone_decorator.rb | 2 | ||||
| -rw-r--r-- | app/decorators/stop_area_decorator.rb | 14 | ||||
| -rw-r--r-- | app/decorators/stop_area_referential_decorator.rb | 4 | 
11 files changed, 29 insertions, 29 deletions
| diff --git a/app/decorators/compliance_control_decorator.rb b/app/decorators/compliance_control_decorator.rb index fd2dbd9ce..7cdb4a890 100644 --- a/app/decorators/compliance_control_decorator.rb +++ b/app/decorators/compliance_control_decorator.rb @@ -5,7 +5,7 @@ class ComplianceControlDecorator < AF83::Decorator    with_instance_decorator do |instance_decorator|      instance_decorator.show_action_link do |l| -      l.content h.t('compliance_control_sets.actions.show') +      l.content t('compliance_control_sets.actions.show')        l.href do          h.compliance_control_set_compliance_control_path(            object.compliance_control_set.id, @@ -17,7 +17,7 @@ class ComplianceControlDecorator < AF83::Decorator      instance_decorator.edit_action_link      instance_decorator.destroy_action_link do |l| -      l.data confirm: h.t('compliance_controls.actions.destroy_confirm') +      l.data confirm: 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 b16a06886..ad38c492c 100644 --- a/app/decorators/compliance_control_set_decorator.rb +++ b/app/decorators/compliance_control_set_decorator.rb @@ -20,7 +20,7 @@ class ComplianceControlSetDecorator < AF83::Decorator      instance_decorator.destroy_action_link do |l|        l.content h.destroy_link_content        l.href { h.compliance_control_set_path(object.id) } -      l.data confirm: h.t('compliance_control_sets.actions.destroy_confirm') +      l.data confirm: t('compliance_control_sets.actions.destroy_confirm')      end    end  end diff --git a/app/decorators/line_decorator.rb b/app/decorators/line_decorator.rb index 077978c36..0fdb7cc0b 100644 --- a/app/decorators/line_decorator.rb +++ b/app/decorators/line_decorator.rb @@ -44,7 +44,7 @@ class LineDecorator < AF83::Decorator        l.content  { h.deactivate_link_content('lines.actions.deactivate') }        l.href     { h.deactivate_line_referential_line_path(context[:line_referential], object) }        l.method   :put -      l.data     confirm: h.t('lines.actions.deactivate_confirm') +      l.data     {{ confirm: h.t('lines.actions.deactivate_confirm') }}        l.add_class "delete-action"      end @@ -52,13 +52,13 @@ class LineDecorator < AF83::Decorator        l.content  { h.activate_link_content('lines.actions.activate') }        l.href     { h.activate_line_referential_line_path(context[:line_referential], object) }        l.method   :put -      l.data     confirm: h.t('lines.actions.activate_confirm') +      l.data     {{ confirm: h.t('lines.actions.activate_confirm') }}        l.add_class "delete-action"      end      instance_decorator.destroy_action_link do |l|        l.content  { h.destroy_link_content('lines.actions.destroy') } -      l.data     confirm: h.t('lines.actions.destroy_confirm') +      l.data     {{ confirm: h.t('lines.actions.destroy_confirm') }}        l.add_class "delete-action"      end    end diff --git a/app/decorators/network_decorator.rb b/app/decorators/network_decorator.rb index ab90e4998..55cd37082 100644 --- a/app/decorators/network_decorator.rb +++ b/app/decorators/network_decorator.rb @@ -25,8 +25,8 @@ class NetworkDecorator < AF83::Decorator      end      instance_decorator.destroy_action_link do |l| -      l.content h.t('networks.actions.destroy') -      l.data confirm: h.t('networks.actions.destroy_confirm') +      l.content { h.destroy_link_content('networks.actions.destroy') } +      l.data {{ confirm: h.t('networks.actions.destroy_confirm') }}      end    end  end diff --git a/app/decorators/purchase_window_decorator.rb b/app/decorators/purchase_window_decorator.rb index 9b58577b2..8e6ca9d36 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: h.t('purchase_windows.actions.destroy_confirm') +      l.data confirm: t('purchase_windows.actions.destroy_confirm')      end    end diff --git a/app/decorators/referential_line_decorator.rb b/app/decorators/referential_line_decorator.rb index a8c210be0..4416e133e 100644 --- a/app/decorators/referential_line_decorator.rb +++ b/app/decorators/referential_line_decorator.rb @@ -18,7 +18,7 @@ class ReferentialLineDecorator < AF83::Decorator      end      instance_decorator.action_link secondary: true do |l| -      l.content h.t('routing_constraint_zones.index.title') +      l.content t('routing_constraint_zones.index.title')        l.href do          h.referential_line_routing_constraint_zones_path(            scope, @@ -36,7 +36,7 @@ class ReferentialLineDecorator < AF83::Decorator        },        secondary: true      ) do |l| -      l.content h.t('routes.actions.new') +      l.content t('routes.actions.new')        l.href { h.new_referential_line_route_path(scope, object) }      end    end diff --git a/app/decorators/referential_network_decorator.rb b/app/decorators/referential_network_decorator.rb index c508452c0..f8c656e7c 100644 --- a/app/decorators/referential_network_decorator.rb +++ b/app/decorators/referential_network_decorator.rb @@ -20,8 +20,8 @@ class ReferentialNetworkDecorator < AF83::Decorator      end      instance_decorator.destroy_action_link do |l| -      l.content h.destroy_link_content('networks.actions.destroy') -      l.data confirm: h.t('networks.actions.destroy_confirm') +      l.content { h.destroy_link_content('networks.actions.destroy') } +      l.data confirm: t('networks.actions.destroy_confirm')      end    end  end diff --git a/app/decorators/route_decorator.rb b/app/decorators/route_decorator.rb index 646bc1620..801e139b0 100644 --- a/app/decorators/route_decorator.rb +++ b/app/decorators/route_decorator.rb @@ -18,7 +18,7 @@ class RouteDecorator < AF83::Decorator        if: ->() { object.stop_points.any? },        secondary: :show      ) do |l| -      l.content h.t('journey_patterns.actions.index') +      l.content t('journey_patterns.actions.index')        l.href do          [            context[:referential], @@ -33,7 +33,7 @@ class RouteDecorator < AF83::Decorator        if: ->() { object.journey_patterns.present? },        secondary: :show      ) do |l| -      l.content h.t('vehicle_journeys.actions.index') +      l.content t('vehicle_journeys.actions.index')        l.href do          [            context[:referential], @@ -45,7 +45,7 @@ class RouteDecorator < AF83::Decorator      end      instance_decorator.action_link secondary: :show do |l| -      l.content h.t('vehicle_journey_exports.new.title') +      l.content t('vehicle_journey_exports.new.title')        l.href do          h.referential_line_route_vehicle_journey_exports_path(            context[:referential], @@ -60,7 +60,7 @@ class RouteDecorator < AF83::Decorator        secondary: :show,        policy: :duplicate      ) do |l| -      l.content h.t('routes.duplicate.title') +      l.content t('routes.duplicate.title')        l.method :post        l.href do          h.duplicate_referential_line_route_path( @@ -76,7 +76,7 @@ class RouteDecorator < AF83::Decorator        policy: :create_opposite,        if: ->{h.has_feature?(:create_opposite_routes)}      ) do |l| -      l.content h.t('routes.create_opposite.title') +      l.content t('routes.create_opposite.title')        l.method :post        l.disabled { object.opposite_route.present? }        l.href do @@ -90,7 +90,7 @@ class RouteDecorator < AF83::Decorator      end      instance_decorator.destroy_action_link do |l| -      l.data confirm: h.t('routes.actions.destroy_confirm') +      l.data confirm: 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 de73068be..3ff286cc1 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: h.t('routing_constraint_zones.actions.destroy_confirm') +      l.data confirm: 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 525681971..c7f10b13b 100644 --- a/app/decorators/stop_area_decorator.rb +++ b/app/decorators/stop_area_decorator.rb @@ -11,11 +11,11 @@ class StopAreaDecorator < AF83::Decorator      instance_decorator.show_action_link      instance_decorator.edit_action_link do |l| -      l.content h.t('stop_areas.actions.edit') +      l.content t('stop_areas.actions.edit')      end      instance_decorator.action_link policy: :deactivate, secondary: true do |l| -      l.content h.deactivate_link_content('stop_areas.actions.deactivate') +      l.content { h.deactivate_link_content('stop_areas.actions.deactivate') }        l.href do          h.deactivate_stop_area_referential_stop_area_path(            object.stop_area_referential, @@ -23,12 +23,12 @@ class StopAreaDecorator < AF83::Decorator          )        end        l.method :put -      l.data confirm: h.t('stop_areas.actions.deactivate_confirm') +      l.data confirm: t('stop_areas.actions.deactivate_confirm')        l.add_class 'delete-action'      end      instance_decorator.action_link policy: :activate, secondary: true do |l| -      l.content h.activate_link_content('stop_areas.actions.activate') +      l.content { h.activate_link_content('stop_areas.actions.activate') }        l.href do          h.activate_stop_area_referential_stop_area_path(            object.stop_area_referential, @@ -36,13 +36,13 @@ class StopAreaDecorator < AF83::Decorator          )        end        l.method :put -      l.data confirm: h.t('stop_areas.actions.activate_confirm') +      l.data confirm: 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: h.t('stop_areas.actions.destroy_confirm') +      l.content { h.destroy_link_content('stop_areas.actions.destroy') } +      l.data confirm: t('stop_areas.actions.destroy_confirm')      end    end diff --git a/app/decorators/stop_area_referential_decorator.rb b/app/decorators/stop_area_referential_decorator.rb index d30501ec9..36e45abca 100644 --- a/app/decorators/stop_area_referential_decorator.rb +++ b/app/decorators/stop_area_referential_decorator.rb @@ -5,9 +5,9 @@ class StopAreaReferentialDecorator < AF83::Decorator      instance_decorator.action_link policy: :synchronize, primary: :show do |l|        l.content t('actions.sync') -      l.href { h. sync_stop_area_referential_path(object.id) } +      l.href { h.sync_stop_area_referential_path(object.id) }        l.method :post      end -     +    end  end | 
