Merge pull request #418 from af83/6156-journey_pattern-translations

Refs #6156 Update english journey pattern translations

8 files changed, 50 insertions, 30 deletions

diff --git a/app/javascript/journey_patterns/components/ConfirmModal.js b/app/javascript/journey_patterns/components/ConfirmModal.js
index ccd0a9384..fdf32649f 100644
--- a/app/javascript/journey_patterns/components/ConfirmModal.js
+++ b/app/javascript/journey_patterns/components/ConfirmModal.js
@@ -9,11 +9,11 @@ export default function ConfirmModal({dispatch, modal, onModalAccept, onModalCan
         <div className='modal-dialog'>
           <div className='modal-content'>
             <div className='modal-header'>
-              <h4 className='modal-title'>Confirmation</h4>
+              <h4 className='modal-title'>{I18n.t('journey_patterns.show.confirmation')}</h4>
             </div>
             <div className='modal-body'>
               <div className='mt-md mb-md'>
-                <p>Vous vous apprêtez à changer de page. Voulez-vous valider vos modifications avant cela ?</p>
+                <p>{I18n.t('journey_patterns.show.confirm_page_change')}</p>
               </div>
             </div>
             <div className='modal-footer'>
@@ -23,7 +23,7 @@ export default function ConfirmModal({dispatch, modal, onModalAccept, onModalCan
                 type='button'
                 onClick={() => { onModalCancel(modal.confirmModal.callback) }}
               >
-                Ne pas valider
+                {I18n.t('cancel')}
             </button>
               <button
                 className='btn btn-primary'
@@ -31,7 +31,7 @@ export default function ConfirmModal({dispatch, modal, onModalAccept, onModalCan
                 type='button'
                 onClick={() => { onModalAccept(modal.confirmModal.callback, journeyPatterns) }}
               >
-                Valider
+                {I18n.t('actions.submit')}
             </button>
             </div>
           </div>
diff --git a/app/javascript/journey_patterns/components/CreateModal.js b/app/javascript/journey_patterns/components/CreateModal.js
index a6c1b608a..36b5740dc 100644
--- a/app/javascript/journey_patterns/components/CreateModal.js
+++ b/app/javascript/journey_patterns/components/CreateModal.js
@@ -38,14 +38,14 @@ export default class CreateModal extends Component {
                   <div className='modal-dialog'>
                     <div className='modal-content'>
                       <div className='modal-header'>
-                        <h4 className='modal-title'>Ajouter une mission</h4>
+                        <h4 className='modal-title'>{I18n.t('journey_patterns.actions.new')}</h4>
                       </div>
 
                       {(this.props.modal.type == 'create') && (
                         <form>
                           <div className='modal-body'>
                             <div className='form-group'>
-                              <label className='control-label is-required'>Nom</label>
+                              <label className='control-label is-required'>{I18n.attribute_name('journey_pattern', 'name')}</label>
                               <input
                                 type='text'
                                 ref='name'
@@ -57,7 +57,7 @@ export default class CreateModal extends Component {
                             <div className='row'>
                               <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
                                 <div className='form-group'>
-                                  <label className='control-label is-required'>Nom public</label>
+                                  <label className='control-label is-required'>{I18n.attribute_name('journey_pattern', 'published_name')}c</label>
                                   <input
                                     type='text'
                                     ref='published_name'
@@ -69,7 +69,7 @@ export default class CreateModal extends Component {
                               </div>
                               <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
                                 <div className='form-group'>
-                                  <label className='control-label'>Code mission</label>
+                                  <label className='control-label'>{I18n.attribute_name('journey_pattern', 'registration_number')}</label>
                                   <input
                                     type='text'
                                     ref='registration_number'
@@ -87,14 +87,14 @@ export default class CreateModal extends Component {
                               type='button'
                               onClick={this.props.onModalClose}
                               >
-                              Annuler
+                              {I18n.t('cancel')}
                             </button>
                             <button
                               className='btn btn-primary'
                               type='button'
                               onClick={this.handleSubmit.bind(this)}
                               >
-                              Valider
+                              {I18n.t('actions.submit')}
                             </button>
                           </div>
                         </form>
diff --git a/app/javascript/journey_patterns/components/EditModal.js b/app/javascript/journey_patterns/components/EditModal.js
index c960cb41c..1960849fb 100644
--- a/app/javascript/journey_patterns/components/EditModal.js
+++ b/app/javascript/journey_patterns/components/EditModal.js
@@ -18,12 +18,12 @@ export default class EditModal extends Component {
     if (this.props.editMode) {
       return (
         <h4 className='modal-title'>
-          Editer la mission
+          {I18n.t('journey_patterns.actions.edit')}
           {this.props.modal.type == 'edit' && <em> "{this.props.modal.modalProps.journeyPattern.name}"</em>}
         </h4>
       )
     } else {
-      return <h4 className='modal-title'> Informations </h4>
+      return <h4 className='modal-title'> {I18n.t('journey_patterns.show.informations')} </h4>
     }
   }
 
@@ -41,7 +41,7 @@ export default class EditModal extends Component {
                 <form>
                   <div className='modal-body'>
                     <div className='form-group'>
-                      <label className='control-label is-required'>Nom</label>
+                      <label className='control-label is-required'>{I18n.attribute_name('journey_pattern', 'name')}</label>
                       <input
                         type='text'
                         ref='name'
@@ -57,7 +57,7 @@ export default class EditModal extends Component {
                     <div className='row'>
                       <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
                         <div className='form-group'>
-                          <label className='control-label is-required'>Nom public</label>
+                          <label className='control-label is-required'>{I18n.attribute_name('journey_pattern', 'published_name')}</label>
                           <input
                             type='text'
                             ref='published_name'
@@ -72,7 +72,7 @@ export default class EditModal extends Component {
                       </div>
                       <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
                         <div className='form-group'>
-                          <label className='control-label'>Code mission</label>
+                          <label className='control-label'>{I18n.attribute_name('journey_pattern', 'registration_number')}</label>
                           <input
                             type='text'
                             ref='registration_number'
@@ -86,7 +86,7 @@ export default class EditModal extends Component {
                       </div>
                     </div>
                     <div>
-                      <label className='control-label'>Signature métier</label>
+                      <label className='control-label'>{I18n.attribute_name('journey_pattern', 'checksum')}</label>
                         <input
                         type='text'
                         ref='checksum'
@@ -105,14 +105,14 @@ export default class EditModal extends Component {
                         type='button'
                         onClick={this.props.onModalClose}
                       >
-                        Annuler
+                        {I18n.t('cancel')}
                       </button>
                       <button
                         className='btn btn-primary'
                         type='button'
                         onClick={this.handleSubmit.bind(this)}
                       >
-                        Valider
+                        {I18n.t('actions.submit')}
                       </button>
                     </div>
                   }
diff --git a/app/javascript/journey_patterns/components/JourneyPattern.js b/app/javascript/journey_patterns/components/JourneyPattern.js
index 00b5497f7..d381b0d50 100644
--- a/app/javascript/journey_patterns/components/JourneyPattern.js
+++ b/app/javascript/journey_patterns/components/JourneyPattern.js
@@ -23,7 +23,7 @@ export default class JourneyPattern extends Component{
     let vjURL = routeURL + '/vehicle_journeys?jp=' + jpOid
 
     return (
-      <a href={vjURL}>Horaires des courses</a>
+      <a href={vjURL}>{I18n.t('journey_patterns.journey_pattern.vehicle_journey_at_stops')}</a>
     )
   }
 
@@ -139,7 +139,7 @@ export default class JourneyPattern extends Component{
         <div className='th'>
           <div className='strong mb-xs'>{this.props.value.object_id ? this.props.value.short_id : '-'}</div>
           <div>{this.props.value.registration_number}</div>
-          <div>{actions.getChecked(this.props.value.stop_points).length} arrêt(s)</div>
+          <div>{I18n.t('journey_patterns.show.stop_points_count', {count: actions.getChecked(this.props.value.stop_points).length})}</div>
           {this.hasFeature('costs_in_journey_patterns') &&
             <div className="small row totals">
               <span className="col-md-6"><i className="fa fa-arrows-h"></i>{totalDistance}</span>
@@ -167,7 +167,7 @@ export default class JourneyPattern extends Component{
                   data-toggle='modal'
                   data-target='#JourneyPatternModal'
                   >
-                  {this.props.editMode ? 'Editer' : 'Consulter'}
+                  {this.props.editMode ? I18n.t('actions.edit') : I18n.t('actions.show')}
                 </button>
               </li>
               <li className={this.props.value.object_id ? '' : 'disabled'}>
@@ -183,7 +183,7 @@ export default class JourneyPattern extends Component{
                     this.props.onDeleteJourneyPattern(this.props.index)}
                   }
                   >
-                    <span className='fa fa-trash'></span>Supprimer
+                    <span className='fa fa-trash'></span>{I18n.t('actions.destroy')}
                   </button>
                 </li>
               </ul>
diff --git a/app/javascript/journey_patterns/components/JourneyPatterns.js b/app/javascript/journey_patterns/components/JourneyPatterns.js
index 930acb390..91c783189 100644
--- a/app/javascript/journey_patterns/components/JourneyPatterns.js
+++ b/app/javascript/journey_patterns/components/JourneyPatterns.js
@@ -84,14 +84,14 @@ export default class JourneyPatterns extends Component {
           <div className='col-lg-12'>
             {(this.props.status.fetchSuccess == false) && (
               <div className="alert alert-danger mt-sm">
-                <strong>Erreur : </strong>
-                la récupération des missions a rencontré un problème. Rechargez la page pour tenter de corriger le problème
+                <strong>{I18n.t('error')} : </strong>
+                {I18n.t('journeys_patterns.journey_pattern.fetching_error')}
               </div>
             )}
 
             { _.some(this.props.journeyPatterns, 'errors') && (
               <div className="alert alert-danger mt-sm">
-                <strong>Erreur : </strong>
+                <strong> {I18n.t('error')} : </strong>
                 {this.props.journeyPatterns.map((jp, index) =>
                   jp.errors && jp.errors.map((err, i) => {
                     return (
@@ -107,9 +107,9 @@ export default class JourneyPatterns extends Component {
             <div className={'table table-2entries mt-sm mb-sm' + ((this.props.journeyPatterns.length > 0) ? '' : ' no_result')}>
               <div className='t2e-head w20'>
                 <div className='th'>
-                  <div className='strong mb-xs'>ID Mission</div>
-                  <div>Code mission</div>
-                  <div>Nb arrêts</div>
+                  <div className='strong mb-xs'>{I18n.t('objectid')}</div>
+                  <div>{I18n.attribute_name('journey_pattern', 'registration_number')}</div>
+                  <div>{I18n.attribute_name('journey_pattern', 'stop_points')}</div>
                   { this.hasFeature('costs_in_journey_patterns') &&
                      <div>
                        <div>{I18n.attribute_name('journey_pattern', 'full_journey_time')}</div>
diff --git a/app/javascript/journey_patterns/components/Navigate.js b/app/javascript/journey_patterns/components/Navigate.js
index 78f324a7d..9e454da5e 100644
--- a/app/javascript/journey_patterns/components/Navigate.js
+++ b/app/javascript/journey_patterns/components/Navigate.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
+import capitalize from 'lodash/capitalize'
 import actions from '../actions'
 
 export default function Navigate({ dispatch, journeyPatterns, pagination, status }) {
@@ -17,7 +18,7 @@ export default function Navigate({ dispatch, journeyPatterns, pagination, status
       <div className='row'>
         <div className='col-lg-12 text-right'>
           <div className='pagination'>
-            Liste des missions {firstItemOnPage} à {(lastItemOnPage < pagination.totalCount) ? lastItemOnPage : pagination.totalCount} sur {pagination.totalCount}
+            {I18n.t('will_paginate.page_entries_info.multi_page', { model: capitalize(I18n.model_name('journey_pattern', { plural: true })), from: firstItemOnPage, to: lastItemOnPage, count: pagination.totalCount})}
             <form className='page_links' onSubmit={e => {
                 e.preventDefault()
               }}>
diff --git a/config/locales/journey_patterns.en.yml b/config/locales/journey_patterns.en.yml
index d480e144d..70ae94dd9 100644
--- a/config/locales/journey_patterns.en.yml
+++ b/config/locales/journey_patterns.en.yml
@@ -1,6 +1,7 @@
 en:
   journey_patterns:
     journey_pattern:
+      fetching_error: "There has been a problem fetching the data. Please reload the page to try again."
       from_to: "From '%{departure}' to '%{arrival}'"
       stop_count: "%{count}/%{route_count} stops"
       vehicle_journeys_count: "Vehicle journeys: %{count}"
@@ -19,6 +20,13 @@ en:
     show:
       title: "Journey Pattern %{journey_pattern}"
       stop_points: "Stop point on journey pattern list"
+      stop_points_count: 
+        none: '%{count} stop areas'
+        one: '%{count} stop area'
+        other: '%{count} stop areas'
+      informations: Informations
+      confirmation: Confimation
+      confirm_page_change: You are about to change page. Would you like to save your work before that ?
     index:
       title: "Journey Patterns of %{route}"
     form:
@@ -50,7 +58,8 @@ en:
         creator_id: "Created by"
         full_journey_time: Full journey
         commercial_journey_time: Commercial journey
-
+        stop_points: Nb stop areas
+        checksum: Checksum
   formtastic:
     titles:
       journey_pattern:
diff --git a/config/locales/journey_patterns.fr.yml b/config/locales/journey_patterns.fr.yml
index 32c1f3f97..10653a02d 100644
--- a/config/locales/journey_patterns.fr.yml
+++ b/config/locales/journey_patterns.fr.yml
@@ -1,6 +1,7 @@
 fr:
   journey_patterns:
     journey_pattern:
+      fetching_error: "La récupération des courses a rencontré un problème. Rechargez la page pour tenter de corriger le problème."
       from_to: "De '%{departure}' à '%{arrival}'"
       stop_count: "%{count}/%{route_count} arrêts"
       vehicle_journeys_count: "Courses: %{count}"
@@ -19,6 +20,13 @@ fr:
     show:
       title: "Mission %{journey_pattern}"
       stop_points: "Liste des arrêts de la mission"
+      stop_points_count: 
+        none: '%{count} arrêt'
+        one: '%{count} arrêt'
+        other: '%{count} arrêts'
+      informations: Informations
+      confirmation: Confimation
+      confirm_page_change: Vous vous apprêtez à changer de page. Voulez-vous valider vos modifications avant cela ?
     index:
       title: "Missions de %{route}"
     form:
@@ -50,6 +58,8 @@ fr:
         creator_id: "Créé par"
         full_journey_time: Parcours complet
         commercial_journey_time: Parcours commercial
+        stop_points: Nb arrêts
+        checksum: Signature métier
   formtastic:
     titles:
       journey_pattern: