aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2018-04-03 21:38:45 +0200
committerGitHub2018-04-03 21:38:45 +0200
commitf7ebfd329727b76241d4cc7f3f9f305ca6e969a5 (patch)
tree05de45698fcbb8e1a3eaaecd29c2d13b8b673637
parent6f6bb81a93d6d1e578f1d44c61299b3180219b92 (diff)
parent868a7f8148f00899d84346b4a49714e4afcf7a1d (diff)
downloadchouette-core-f7ebfd329727b76241d4cc7f3f9f305ca6e969a5.tar.bz2
Merge pull request #435 from af83/6400-vehicle-journey-i18n
Refs #6400 Fix typos for VJ i18n
-rw-r--r--app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js2
-rw-r--r--config/locales/vehicle_journeys.fr.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js b/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js
index 7a2686c13..9ee2e1849 100644
--- a/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js
+++ b/app/javascript/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js
@@ -58,7 +58,7 @@ export default class TimetablesEditVehicleJourney extends Component {
<div className='wrapper'>
<div>
<div className='form-group'>
- <label className='control-label'>{this.props.modal.modalProps.timetables.length == 0 ? I18n.t('vehicle_journeys.vehicle_journeys_matrix.no_associated_timetables'): I18n.t('vehicle_journeys.form.timetables')}</label>
+ <label className='control-label'>{this.props.modal.modalProps.timetables.length == 0 ? I18n.t('vehicle_journeys.vehicle_journeys_matrix.no_associated_timetables'): I18n.t('vehicle_journeys.form.time_tables')}</label>
</div>
</div>
<div></div>
diff --git a/config/locales/vehicle_journeys.fr.yml b/config/locales/vehicle_journeys.fr.yml
index 4336bc6dc..2fbb43f95 100644
--- a/config/locales/vehicle_journeys.fr.yml
+++ b/config/locales/vehicle_journeys.fr.yml
@@ -121,7 +121,7 @@ fr:
checksum: "Signature métier"
comment: "Commentaires"
company: "Transporteur"
- company|_name: "Nom du transporteur"
+ company_name: "Nom du transporteur"
created_at: "Créé le"
creator_id: "Créé par"
departure_time: "Départ"