diff options
| author | Thomas Haddad | 2017-05-03 17:28:42 +0200 |
|---|---|---|
| committer | Thomas Haddad | 2017-05-03 17:28:42 +0200 |
| commit | fdff8db191dbda598406392ccfdde251318d7140 (patch) | |
| tree | 243aa8657b1ca7e63dd43aa76c5aab0b50af3a45 | |
| parent | 9c1ce95c49b7410bd5e28ec13f9a8ed86b75dbc8 (diff) | |
| download | chouette-core-fdff8db191dbda598406392ccfdde251318d7140.tar.bz2 | |
Refs #3284: use I18n for transport_(sub)mode in vj edit
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
4 files changed, 7 insertions, 5 deletions
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 { <input type='text' className='form-control' - value={this.props.modal.modalProps.vehicleJourney.transport_mode} + value={window.I18n.fr.enumerize.line.transport_mode[this.props.modal.modalProps.vehicleJourney.transport_mode]} disabled={true} /> </div> @@ -119,7 +119,7 @@ class EditVehicleJourney extends Component { <input type='text' className='form-control' - value={this.props.modal.modalProps.vehicleJourney.transport_submode} + value={window.I18n.fr.enumerize.line.transport_submode[this.props.modal.modalProps.vehicleJourney.transport_submode]} disabled={true} /> </div> 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' diff --git a/config/locales/enumerize.fr.yml b/config/locales/enumerize.fr.yml index 6ce7fd1cc..8b6c8092d 100644 --- a/config/locales/enumerize.fr.yml +++ b/config/locales/enumerize.fr.yml @@ -108,6 +108,7 @@ fr: transport_mode: interchange: Interconnection unknown: Inconnu + undefined: 'Non défini' air: Air train: Train long_distance_train: Train Grande Ligne |
