From fdff8db191dbda598406392ccfdde251318d7140 Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Wed, 3 May 2017 17:28:42 +0200 Subject: Refs #3284: use I18n for transport_(sub)mode in vj edit Signed-off-by: Thomas Shawarma Haddad --- .../javascripts/es6_browserified/vehicle_journeys/actions/index.js | 4 ++-- .../vehicle_journeys/components/tools/EditVehicleJourney.js | 4 ++-- app/views/vehicle_journeys/index.html.slim | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js index 444d290ee..ea03694bd 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js @@ -317,8 +317,8 @@ const actions = { published_journey_name: val.published_journey_name || 'non renseigné', published_journey_identifier: val.published_journey_identifier || 'non renseigné', company: val.company || 'non renseigné', - transport_mode: val.route.line.transport_mode || 'non renseigné', - transport_submode: val.route.line.transport_submode || 'non renseigné' + transport_mode: val.route.line.transport_mode || 'undefined', + transport_submode: val.route.line.transport_submode || 'undefined' }) } window.currentItemsLength = vehicleJourneys.length diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js index 3ccc8b4d8..932c56532 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js @@ -108,7 +108,7 @@ class EditVehicleJourney extends Component { @@ -119,7 +119,7 @@ class EditVehicleJourney extends Component { diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim index 92bc3951a..38e07ad82 100644 --- a/app/views/vehicle_journeys/index.html.slim +++ b/app/views/vehicle_journeys/index.html.slim @@ -19,6 +19,7 @@ | window.vehicleJourneysLength = #{@vehicle_journeys.total_entries()}; | window.vehicleJourneysPerPage = #{@ppage}; | window.line_footnotes = #{raw @footnotes}; - | window.perms = #{raw @perms} + | window.perms = #{raw @perms}; + | window.I18n = #{(I18n.backend.send(:translations).to_json).html_safe}; = javascript_include_tag 'es6_browserified/vehicle_journeys/index.js' -- cgit v1.2.3