Refs #2859: fix wording issues

13 files changed, 20 insertions, 18 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/ConfirmModal.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/ConfirmModal.js
index 5e51f469c..c2229d991 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/ConfirmModal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/ConfirmModal.js
@@ -12,7 +12,7 @@ const ConfirmModal = ({dispatch, modal, onModalAccept, onModalCancel, journeyPat
           </div>
           <div className='modal-body'>
             <div className='mt-md mb-md'>
-              <p>Vous vous apprêtez à changer de page. Voulez-vous enregistrer vos modifications avant cela ?</p>
+              <p>Vous vous apprêtez à changer de page. Voulez-vous valider vos modifications avant cela ?</p>
             </div>
           </div>
           <div className='modal-footer'>
@@ -22,7 +22,7 @@ const ConfirmModal = ({dispatch, modal, onModalAccept, onModalCancel, journeyPat
               type='button'
               onClick= {() => {onModalCancel(modal.confirmModal.callback)}}
               >
-              Ne pas enregistrer
+              Ne pas valider
             </button>
             <button
               className='btn btn-primary'
@@ -30,7 +30,7 @@ const ConfirmModal = ({dispatch, modal, onModalAccept, onModalCancel, journeyPat
               type='button'
               onClick = {() => {onModalAccept(modal.confirmModal.callback, journeyPatterns)}}
               >
-              Enregistrer
+              Valider
             </button>
           </div>
         </div>
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/EditModal.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/EditModal.js
index faac89a21..81c59b2ce 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/EditModal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/EditModal.js
@@ -23,7 +23,7 @@ class EditModal extends Component {
             <div className='modal-content'>
               <div className='modal-header'>
                 <h4 className='modal-title'>
-                  Modifier la mission
+                  Editer la mission
                   {(this.props.modal.type == 'edit') && (
                     <em> "{this.props.modal.modalProps.journeyPattern.name}"</em>
                   )}
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
index 3c20e4da4..3dae38d74 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
@@ -81,7 +81,7 @@ class JourneyPattern extends Component{
                     data-toggle='modal'
                     data-target='#JourneyPatternModal'
                     >
-                    Modifier
+                    Editer
                   </a>
                 </li>
                 <li className={this.props.value.object_id ? '' : 'disabled'}>
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js
index b4b278ae4..6e09430a0 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js
@@ -31,7 +31,7 @@ class SaveJourneyPattern extends Component{
                   actions.submitJourneyPattern(this.props.dispatch, this.props.journeyPatterns)
                 }}
                 >
-                Enregistrer
+                Valider
               </button>
             </form>
           </div>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/ConfirmModal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/ConfirmModal.js
index e1f40a2f9..54f0287c6 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/ConfirmModal.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/ConfirmModal.js
@@ -7,7 +7,7 @@ const ConfirmModal = ({dispatch, modal, onModalAccept, onModalCancel, vehicleJou
     <div className='modal-dialog'>
       <div className='modal-content'>
         <div className='modal-body'>
-          <p> Voulez-vous enregistrer vos modifications avant de changer de page? </p>
+          <p> Voulez-vous valider vos modifications avant de changer de page? </p>
         </div>
         <div className='modal-footer'>
           <button
@@ -16,7 +16,7 @@ const ConfirmModal = ({dispatch, modal, onModalAccept, onModalCancel, vehicleJou
             type='button'
             onClick= {() => {onModalCancel(modal.confirmModal.callback)}}
             >
-            Ne pas enregistrer
+            Ne pas valider
           </button>
           <button
             className='btn btn-danger'
@@ -24,7 +24,7 @@ const ConfirmModal = ({dispatch, modal, onModalAccept, onModalCancel, vehicleJou
             type='button'
             onClick = {() => {onModalAccept(modal.confirmModal.callback, vehicleJourneys)}}
             >
-            Enregistrer
+            Valider
           </button>
         </div>
       </div>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js
index 2c4e75681..b22e1d826 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js
@@ -31,7 +31,7 @@ class SaveVehicleJourneys extends Component{
                   actions.submitVehicleJourneys(this.props.dispatch, this.props.vehicleJourneys)
                 }}
               >
-                Enregistrer
+                Valider
               </button>
             </form>
           </div>
diff --git a/app/assets/stylesheets/components/_page_header.sass b/app/assets/stylesheets/components/_page_header.sass
index 3bbd429a9..8ca9f3faa 100644
--- a/app/assets/stylesheets/components/_page_header.sass
+++ b/app/assets/stylesheets/components/_page_header.sass
@@ -20,6 +20,10 @@
   .page-title
     display: inline-block
     vertical-align: middle
+    width: calc(100% - 65px)
+
+    &:first-child
+      width: 100%
 
     h1
       margin: 0
diff --git a/app/views/journey_patterns_collections/show.html.slim b/app/views/journey_patterns_collections/show.html.slim
index a2058fa64..0d09817e8 100644
--- a/app/views/journey_patterns_collections/show.html.slim
+++ b/app/views/journey_patterns_collections/show.html.slim
@@ -1,6 +1,6 @@
 / pageheader
 = pageheader 'map-marker',
-             "Missions de #{@route.name}",
+             "Missions de #{@route.try(:stop_points).first.try(:stop_area).name} vers #{@route.try(:stop_points).last.try(:stop_area).name}",
              'Lorem ipsum dolor sit amet',
              (@journey_patterns.any? ? t('last_update', time: l(@journey_patterns.last.updated_at, format: :short)) : '')
 
diff --git a/app/views/layouts/navigation/_main_nav_left.html.slim b/app/views/layouts/navigation/_main_nav_left.html.slim
index 5df421a50..efdb81d9c 100644
--- a/app/views/layouts/navigation/_main_nav_left.html.slim
+++ b/app/views/layouts/navigation/_main_nav_left.html.slim
@@ -82,12 +82,12 @@
             = link_to Rails.application.config.try(:codifligne_url), target: '_blank', class: 'list-group-item' do
               span
                 span.fa.fa-2x.fa-circle
-                |Codifligne (iLICO)
+                |iLICO
 
             = link_to Rails.application.config.try(:reflex_url), target: '_blank', class: 'list-group-item' do
               span
                 span.fa.fa-2x.fa-circle
-                |Reflex (iCAR)
+                |iCAR
 
             = link_to '#', target: '_blank', class: 'list-group-item' do
               span
diff --git a/app/views/line_footnotes/edit.html.slim b/app/views/line_footnotes/edit.html.slim
index 0dda8bf0f..f368ea918 100644
--- a/app/views/line_footnotes/edit.html.slim
+++ b/app/views/line_footnotes/edit.html.slim
@@ -19,4 +19,4 @@
             .links.nested-linker
               = link_to_add_association t('footnotes.actions.add_footnote'), form, :footnotes, class: 'btn btn-outline-primary'
 
-            = form.button :submit, 'Enregistrer', class: 'btn btn-default formSubmitr', form: 'notes_form'
+            = form.button :submit, class: 'btn btn-default formSubmitr', form: 'notes_form'
diff --git a/app/views/referentials/_form.html.slim b/app/views/referentials/_form.html.slim
index 82ac83245..a33c2fab0 100644
--- a/app/views/referentials/_form.html.slim
+++ b/app/views/referentials/_form.html.slim
@@ -69,5 +69,4 @@
   .hidden = form.input :workbench_id, as: :hidden
 
 
-  / = link_to 'Annuler', @referential,  class: 'btn btn-link'
-  = form.button :submit, 'Enregistrer', class: 'btn btn-default formSubmitr', form: 'referential_form'
+  = form.button :submit, class: 'btn btn-default formSubmitr', form: 'referential_form'
diff --git a/app/views/routes/_form.html.slim b/app/views/routes/_form.html.slim
index 6ad9d5e50..64c4f5730 100644
--- a/app/views/routes/_form.html.slim
+++ b/app/views/routes/_form.html.slim
@@ -17,7 +17,7 @@
     .col-lg-12
       #stop_points
 
-  = f.button :submit, 'Enregistrer', class: 'btn btn-default formSubmitr', form: 'route_form'
+  = f.button :submit, class: 'btn btn-default formSubmitr', form: 'route_form'
 
 
 // Get JSON data for route stop points
diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim
index 223284523..f6c4c9c10 100644
--- a/app/views/workbenches/show.html.slim
+++ b/app/views/workbenches/show.html.slim
@@ -24,7 +24,6 @@
     - if @wbench_refs.any?
       .row
         .col-lg-12
-          / actions for table: controler+integrer, consulter, modifier, controler, dupliquer, conserver, purger, supprimer
           = table_builder @wbench_refs,
             { :name => 'name', :status => Proc.new {|w| w.archived? ? ("<span class='fa fa-archive'></span> Conservé").html_safe : '-'},
               :organisation => Proc.new {|w| w.organisation.name},