Merge pull request #300 from af83/5888-fix-i18n-in-js

5888 Fix I18n in JS

14 files changed, 59 insertions, 57 deletions

diff --git a/app/javascript/routes/components/BSelect2.js b/app/javascript/routes/components/BSelect2.js
index 158deaa17..035bce155 100644
--- a/app/javascript/routes/components/BSelect2.js
+++ b/app/javascript/routes/components/BSelect2.js
@@ -85,7 +85,7 @@ class BSelect2 extends Component{
         onSelect={ this.props.onSelect }
         ref='newSelect'
         options={{
-          placeholder: this.context.I18n.routes.edit.select2.placeholder,
+          placeholder: this.context.I18n.t("routes.edit.select2.placeholder"),
           allowClear: true,
           language: 'fr', /* Doesn't seem to work... :( */
           theme: 'bootstrap',
diff --git a/app/javascript/routes/components/OlMap.js b/app/javascript/routes/components/OlMap.js
index 056bddbcb..4beb02872 100644
--- a/app/javascript/routes/components/OlMap.js
+++ b/app/javascript/routes/components/OlMap.js
@@ -115,40 +115,40 @@ export default class OlMap extends Component{
               <strong>{this.props.value.olMap.json.name}</strong>
             </p>
             <p>
-              <strong>{this.context.I18n.routes.edit.stop_point_type} : </strong>
+              <strong>{this.context.I18n.t('routes.edit.map.stop_point_type')} : </strong>
               {this.props.value.olMap.json.area_type}
             </p>
             <p>
-              <strong>{this.context.I18n.routes.edit.short_name} : </strong>
+              <strong>{this.context.I18n.t('routes.edit.map.short_name')} : </strong>
               {this.props.value.olMap.json.short_name}
             </p>
             <p>
-              <strong>{this.context.I18n.id_reflex} : </strong>
+              <strong>{this.context.I18n.t('id_reflex')} : </strong>
               {this.props.value.olMap.json.user_objectid}
             </p>
 
-            <p><strong>{this.context.I18n.routes.edit.map.coordinates} : </strong></p>
+            <p><strong>{this.context.I18n.t('routes.edit.map.coordinates')} : </strong></p>
             <p style={{paddingLeft: 10, marginTop: 0}}>
-              <em>{this.context.I18n.routes.edit.map.proj}.: </em>WSG84<br/>
-              <em>{this.context.I18n.routes.edit.map.lat}.: </em>{this.props.value.olMap.json.latitude} <br/>
-              <em>{this.context.I18n.routes.edit.map.lon}.: </em>{this.props.value.olMap.json.longitude}
+              <em>{this.context.I18n.t('routes.edit.map.proj')}.: </em>WSG84<br/>
+              <em>{this.context.I18n.t('routes.edit.map.lat')}.: </em>{this.props.value.olMap.json.latitude} <br/>
+              <em>{this.context.I18n.t('routes.edit.map.lon')}.: </em>{this.props.value.olMap.json.longitude}
             </p>
             <p>
-              <strong>{this.context.I18n.routes.edit.map.postal_code} : </strong>
+              <strong>{this.context.I18n.t('routes.edit.map.postal_code')} : </strong>
               {this.props.value.olMap.json.zip_code}
             </p>
             <p>
-              <strong>{this.context.I18n.routes.edit.map.city} : </strong>
+              <strong>{this.context.I18n.t('routes.edit.map.city')} : </strong>
               {this.props.value.olMap.json.city_name}
             </p>
             <p>
-              <strong>{this.context.I18n.routes.edit.map.comment} : </strong>
+              <strong>{this.context.I18n.t('routes.edit.map.comment')} : </strong>
               {this.props.value.olMap.json.comment}
             </p>
             {(this.props.value.stoparea_id != this.props.value.olMap.json.stoparea_id) &&(
               <div className='btn btn-outline-primary btn-sm'
                 onClick= {() => {this.props.onUpdateViaOlMap(this.props.index, this.props.value.olMap.json)}}
-              >{this.context.I18n.actions.select}</div>
+              >{this.context.I18n.t('actions.select')}</div>
             )}
           </div>
             <div className='map_content'>
@@ -162,7 +162,7 @@ export default class OlMap extends Component{
   }
 }
 
-OlMap.PropTypes = {
+OlMap.propTypes = {
 }
 
 OlMap.contextTypes = {
diff --git a/app/javascript/routes/components/StopPoint.js b/app/javascript/routes/components/StopPoint.js
index 2d47e802b..af51a6bb4 100644
--- a/app/javascript/routes/components/StopPoint.js
+++ b/app/javascript/routes/components/StopPoint.js
@@ -18,15 +18,15 @@ export default function StopPoint(props, {I18n}) {
 
         <div>
           <select className='form-control' value={props.value.for_boarding} id="for_boarding" onChange={props.onSelectChange}>
-            <option value="normal">{I18n.routes.edit.stop_point.boarding.normal}</option>
-            <option value="forbidden">{I18n.routes.edit.stop_point.boarding.forbidden}</option>
+            <option value="normal">{I18n.t('routes.edit.stop_point.boarding.normal')}</option>
+            <option value="forbidden">{I18n.t('routes.edit.stop_point.boarding.forbidden')}</option>
           </select>
         </div>
 
         <div>
           <select className='form-control' value={props.value.for_alighting} id="for_alighting" onChange={props.onSelectChange}>
-            <option value="normal">{I18n.routes.edit.stop_point.alighting.normal}</option>
-            <option value="forbidden">{I18n.routes.edit.stop_point.alighting.forbidden}</option>
+            <option value="normal">{I18n.t('routes.edit.stop_point.alighting.normal')}</option>
+            <option value="forbidden">{I18n.t('routes.edit.stop_point.alighting.forbidden')}</option>
           </select>
         </div>
 
@@ -77,7 +77,7 @@ export default function StopPoint(props, {I18n}) {
   )
 }
 
-StopPoint.PropTypes = {
+StopPoint.propTypes = {
   onToggleMap: PropTypes.func.isRequired,
   onToggleEdit: PropTypes.func.isRequired,
   onDeleteClick: PropTypes.func.isRequired,
@@ -93,4 +93,4 @@ StopPoint.PropTypes = {
 
 StopPoint.contextTypes = {
   I18n: PropTypes.object
-}
\ No newline at end of file
+}
diff --git a/app/javascript/routes/components/StopPointList.js b/app/javascript/routes/components/StopPointList.js
index b39fa0c9c..b227abdea 100644
--- a/app/javascript/routes/components/StopPointList.js
+++ b/app/javascript/routes/components/StopPointList.js
@@ -10,22 +10,22 @@ export default function StopPointList({ stopPoints, onDeleteClick, onMoveUpClick
         <div className="wrapper">
           <div style={{width: 100}}>
             <div className="form-group">
-              <label className="control-label">{I18n.reflex_id}</label>
+              <label className="control-label">{I18n.t('simple_form.labels.stop_point.reflex_id')}</label>
             </div>
           </div>
           <div>
             <div className="form-group">
-              <label className="control-label">{I18n.simple_form.labels.stop_point.name}</label>
+              <label className="control-label">{I18n.t('simple_form.labels.stop_point.name')}</label>
             </div>
           </div>
           <div>
             <div className="form-group">
-              <label className="control-label">{I18n.simple_form.labels.stop_point.for_boarding}</label>
+              <label className="control-label">{I18n.t('simple_form.labels.stop_point.for_boarding')}</label>
             </div>
           </div>
           <div>
             <div className="form-group">
-              <label className="control-label">{I18n.simple_form.labels.stop_point.for_alighting}</label>
+              <label className="control-label">{I18n.t('simple_form.labels.stop_point.for_alighting')}</label>
             </div>
           </div>
           <div className='actions-5'></div>
diff --git a/app/javascript/time_tables/actions/index.js b/app/javascript/time_tables/actions/index.js
index 4a36ec4e1..98b9eab4b 100644
--- a/app/javascript/time_tables/actions/index.js
+++ b/app/javascript/time_tables/actions/index.js
@@ -8,7 +8,7 @@ const I18n = clone(window, "I18n")
 
 const actions = {
   weekDays: (index) => {
-    return range(1, 8).map(n => I18n.time_tables.edit.metas.days[n])
+    return range(1, 8).map(n => I18n.t('time_tables.edit.metas.days')[n])
   },
   strToArrayDayTypes: (str) =>{
     return actions.weekDays().map(day => str.indexOf(day) !== -1)
@@ -155,7 +155,7 @@ const actions = {
     type : 'CLOSE_MODAL'
   }),
   monthName(strDate) {
-    let monthList = range(1,13).map(n => I18n.calendars.months[n])
+    let monthList = range(1,13).map(n => I18n.t('calendars.months.'+ n ))
     let date = new Date(strDate)
     return monthList[date.getUTCMonth()]
   },
@@ -225,7 +225,7 @@ const actions = {
       let period = periods[i]
       if (index !== i && !period.deleted) {
         if (new Date(period.period_start) <= end && new Date(period.period_end) >= start)  {
-          error = I18n.time_tables.edit.error_submit.periods_overlaps
+          error = I18n.t('time_tables.edit.error_submit.periods_overlaps')
           break
         }
       }
@@ -239,7 +239,7 @@ const actions = {
 
     for (let day of in_days) {
       if (start <= new Date(day.date) && end >= new Date(day.date)) {
-        error = I18n.time_tables.edit.error_submit.dates_overlaps
+        error = I18n.t('time_tables.edit.error_submit.dates_overlaps')
         break
       }
     }
@@ -316,9 +316,9 @@ const actions = {
   errorModalMessage: (errorKey) => {
     switch (errorKey) {
       case "withoutPeriodsWithDaysTypes":
-        return I18n.time_tables.edit.error_modal.withoutPeriodsWithDaysTypes
+        return I18n.t('time_tables.edit.error_modal.withoutPeriodsWithDaysTypes')
       case "withPeriodsWithoutDayTypes":
-        return I18n.time_tables.edit.error_modal.withPeriodsWithoutDayTypes
+        return I18n.t('time_tables.edit.error_modal.withPeriodsWithoutDayTypes')
       default:
         return errorKey
 
diff --git a/app/javascript/time_tables/components/ConfirmModal.js b/app/javascript/time_tables/components/ConfirmModal.js
index 845e7ed1b..4e8583bc0 100644
--- a/app/javascript/time_tables/components/ConfirmModal.js
+++ b/app/javascript/time_tables/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'>{I18n.time_tables.edit.confirm_modal.title}</h4>
+              <h4 className='modal-title'>{I18n.t('time_tables.edit.confirm_modal.title')}</h4>
             </div>
             <div className='modal-body'>
               <div className='mt-md mb-md'>
-                <p>{I18n.time_tables.edit.confirm_modal.message}</p>
+                <p>{I18n.t('time_tables.edit.confirm_modal.message')}</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) }}
               >
-                {I18n.cancel}
+                {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, timetable, metas) }}
               >
-                {I18n.actions.submit}
+                {I18n.t('actions.submit')}
               </button>
             </div>
           </div>
@@ -49,4 +49,4 @@ ConfirmModal.propTypes = {
 
 ConfirmModal.contextTypes = {
   I18n: PropTypes.object
-}
\ No newline at end of file
+}
diff --git a/app/javascript/time_tables/components/ErrorModal.js b/app/javascript/time_tables/components/ErrorModal.js
index 543177e54..8af12f1d1 100644
--- a/app/javascript/time_tables/components/ErrorModal.js
+++ b/app/javascript/time_tables/components/ErrorModal.js
@@ -10,7 +10,7 @@ export default function ErrorModal({dispatch, modal, onModalClose}, {I18n}) {
         <div className='modal-dialog'>
           <div className='modal-content'>
             <div className='modal-header'>
-              <h4 className='modal-title'>{I18n.time_tables.edit.error_modal.title}</h4>
+              <h4 className='modal-title'>{I18n.t('time_tables.edit.error_modal.title')}</h4>
             </div>
             <div className='modal-body'>
               <div className='mt-md mb-md'>
@@ -24,7 +24,7 @@ export default function ErrorModal({dispatch, modal, onModalClose}, {I18n}) {
                 type='button'
                 onClick={() => { onModalClose() }}
               >
-                {I18n.back}
+                {I18n.t('back')}
               </button>
             </div>
           </div>
@@ -41,4 +41,4 @@ ErrorModal.propTypes = {
 
 ErrorModal.contextTypes = {
   I18n: PropTypes.object
-}
\ No newline at end of file
+}
diff --git a/app/javascript/time_tables/components/Metas.js b/app/javascript/time_tables/components/Metas.js
index 3c6848d27..08a6e26fe 100644
--- a/app/javascript/time_tables/components/Metas.js
+++ b/app/javascript/time_tables/components/Metas.js
@@ -13,7 +13,7 @@ export default function Metas({metas, onUpdateDayTypes, onUpdateComment, onUpdat
           {/* comment (name) */}
           <div className="form-group">
             <label htmlFor="" className="control-label col-sm-4 required">
-              {I18n.time_tables.edit.metas.name} <abbr title="">*</abbr>
+              {I18n.t('time_tables.edit.metas.name')} <abbr title="">*</abbr>
             </label>
             <div className="col-sm-8">
               <input
@@ -28,7 +28,7 @@ export default function Metas({metas, onUpdateDayTypes, onUpdateComment, onUpdat
 
           {/* color */}
           {metas.color !== undefined && <div className="form-group">
-            <label htmlFor="" className="control-label col-sm-4">{I18n.activerecord.attributes.time_table.color}</label>
+            <label htmlFor="" className="control-label col-sm-4">{I18n.attribute_name('time_table', 'color')}</label>
             <div className="col-sm-8">
               <div className="dropdown color_selector">
                 <button
@@ -73,7 +73,7 @@ export default function Metas({metas, onUpdateDayTypes, onUpdateComment, onUpdat
 
           {/* tags */}
           {metas.tags !== undefined && <div className="form-group">
-            <label htmlFor="" className="control-label col-sm-4">{I18n.activerecord.attributes.time_table.tag_list}</label>
+            <label htmlFor="" className="control-label col-sm-4">{I18n.attribute_name('time_table', 'tag_list')}</label>
             <div className="col-sm-8">
               <TagsSelect2
                 initialTags={metas.initial_tags}
@@ -86,16 +86,16 @@ export default function Metas({metas, onUpdateDayTypes, onUpdateComment, onUpdat
 
           {/* calendar */}
           {metas.calendar !== null && <div className="form-group">
-            <label htmlFor="" className="control-label col-sm-4">{I18n.activerecord.attributes.time_table.calendar}</label>
+            <label htmlFor="" className="control-label col-sm-4">{I18n.attribute_name('time_table', 'calendar')}</label>
             <div className="col-sm-8">
-              <span>{metas.calendar ? metas.calendar.name : I18n.time_tables.edit.metas.no_calendar}</span>
+              <span>{metas.calendar ? metas.calendar.name : I18n.t('time_tables.edit.metas.no_calendar')}</span>
             </div>
           </div>}
 
           {/* day_types */}
           <div className="form-group">
             <label htmlFor="" className="control-label col-sm-4">
-              {I18n.time_tables.edit.metas.day_types}
+              {I18n.t('time_tables.edit.metas.day_types')}
             </label>
             <div className="col-sm-8">
               <div className="form-group labelled-checkbox-group">
diff --git a/app/javascript/time_tables/components/PeriodForm.js b/app/javascript/time_tables/components/PeriodForm.js
index 085654a88..d17a246f7 100644
--- a/app/javascript/time_tables/components/PeriodForm.js
+++ b/app/javascript/time_tables/components/PeriodForm.js
@@ -46,7 +46,7 @@ export default function PeriodForm({modal, timetable, metas, onOpenAddPeriodForm
                     <div>
                       <div className="form-group">
                         <label htmlFor="" className="control-label required">
-                          {I18n.time_tables.edit.period_form.begin}
+                          {I18n.t('time_tables.edit.period_form.begin')}
                           <abbr title="requis">*</abbr>
                         </label>
                       </div>
@@ -54,7 +54,7 @@ export default function PeriodForm({modal, timetable, metas, onOpenAddPeriodForm
                     <div>
                       <div className="form-group">
                         <label htmlFor="" className="control-label required">
-                          {I18n.time_tables.edit.period_form.end}
+                          {I18n.t('time_tables.edit.period_form.end')}
                           <abbr title="requis">*</abbr>
                         </label>
                       </div>
@@ -105,14 +105,14 @@ export default function PeriodForm({modal, timetable, metas, onOpenAddPeriodForm
                     className='btn btn-link'
                     onClick={onClosePeriodForm}
                   >
-                    {I18n.cancel}
+                    {I18n.t('cancel')}
                   </button>
                   <button
                     type='button'
                     className='btn btn-outline-primary mr-sm'
                     onClick={() => onValidatePeriodForm(modal.modalProps, timetable.time_table_periods, metas, filter(timetable.time_table_dates, ['in_out', true]))}
                   >
-                    {I18n.actions.submit}
+                    {I18n.t('actions.submit')}
                   </button>
                 </div>
               </div>
@@ -124,7 +124,7 @@ export default function PeriodForm({modal, timetable, metas, onOpenAddPeriodForm
                   className='btn btn-outline-primary'
                   onClick={onOpenAddPeriodForm}
                 >
-                  {I18n.time_tables.actions.add_period}
+                  {I18n.t('time_tables.actions.add_period')}
                 </button>
               </div>
             }
@@ -132,7 +132,7 @@ export default function PeriodForm({modal, timetable, metas, onOpenAddPeriodForm
         </div>
       </div>
     </div>
-  ) 
+  )
 }
 
 PeriodForm.propTypes = {
@@ -147,4 +147,4 @@ PeriodForm.propTypes = {
 
 PeriodForm.contextTypes = {
   I18n: PropTypes.object
-}
\ No newline at end of file
+}
diff --git a/app/javascript/time_tables/components/TagsSelect2.js b/app/javascript/time_tables/components/TagsSelect2.js
index dc3739d58..43cf59fdf 100644
--- a/app/javascript/time_tables/components/TagsSelect2.js
+++ b/app/javascript/time_tables/components/TagsSelect2.js
@@ -40,7 +40,7 @@ export default class TagsSelect2 extends Component {
           allowClear: true,
           theme: 'bootstrap',
           width: '100%',
-          placeholder: this.context.I18n.time_tables.edit.select2.tag.placeholder,
+          placeholder: this.context.I18n.t('time_tables.edit.select2.tag.placeholder'),
           ajax: {
             url: origin + path + '/tags.json',
             dataType: 'json',
diff --git a/app/javascript/time_tables/components/Timetable.js b/app/javascript/time_tables/components/Timetable.js
index c44f2a134..991f31435 100644
--- a/app/javascript/time_tables/components/Timetable.js
+++ b/app/javascript/time_tables/components/Timetable.js
@@ -31,11 +31,11 @@ export default class Timetable extends Component {
         <div className="table table-2entries mb-sm">
           <div className="t2e-head w20">
             <div className="th">
-              <div className="strong">{this.context.I18n.time_tables.synthesis}</div>
+              <div className="strong">{this.context.I18n.t('time_tables.edit.synthesis')}</div>
             </div>
-            <div className="td"><span>{this.context.I18n.time_tables.edit.day_types}</span></div>
-            <div className="td"><span>{this.context.I18n.time_tables.edit.periods}</span></div>
-            <div className="td"><span>{this.context.I18n.time_tables.edit.exceptions}</span></div>
+            <div className="td"><span>{this.context.I18n.t('time_tables.edit.day_types')}</span></div>
+            <div className="td"><span>{this.context.I18n.t('time_tables.edit.periods')}</span></div>
+            <div className="td"><span>{this.context.I18n.t('time_tables.edit.exceptions')}</span></div>
           </div>
           <div className="t2e-item-list w80">
             <div>
diff --git a/app/views/time_tables/_form.html.slim b/app/views/time_tables/_form.html.slim
index d06fdf444..007044e65 100644
--- a/app/views/time_tables/_form.html.slim
+++ b/app/views/time_tables/_form.html.slim
@@ -5,7 +5,7 @@
       = form.input :comment, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.time_table.comment")}
 
       - if @time_table.new_record? && !@time_table.created_from
-        = form.input :calendar_id, as: :select, input_html: { class: 'tt_target', style: "width: 100%", data: { 'select2-ajax': 'true', 'select2ed-placeholder': 'Indiquez un modèle de calendrier...', term: 'name_cont', url: autocomplete_calendars_path}}
+        = form.input :calendar_id, as: :select, input_html: { class: 'tt_target', style: "width: 100%", data: { 'select2-ajax': 'true', 'select2ed-placeholder': 'Indiquez un modèle de calendrier...', term: 'name_cont', url: autocomplete_workgroup_calendars_path(current_workgroup)}}
 
       - if @time_table.created_from
         = form.input :created_from, disabled: true, input_html: { value: @time_table.created_from.comment }
diff --git a/config/locales/stop_points.en.yml b/config/locales/stop_points.en.yml
index d22d85731..72e138270 100644
--- a/config/locales/stop_points.en.yml
+++ b/config/locales/stop_points.en.yml
@@ -55,3 +55,4 @@ en:
         name: Stop Point
         for_boarding: "Pickup"
         for_alighting: "Drop off"
+        reflex_id: ID
diff --git a/config/locales/stop_points.fr.yml b/config/locales/stop_points.fr.yml
index d3c873442..71be684f6 100644
--- a/config/locales/stop_points.fr.yml
+++ b/config/locales/stop_points.fr.yml
@@ -52,6 +52,7 @@ fr:
   simple_form:
     labels:
       stop_point:
-        name: Arrêt 
+        name: Arrêt
         for_boarding: "Montée"
         for_alighting: "Descente"
+        reflex_id: ID